author | Thomas Arendsen Hein <thomas@intevation.de> |
Fri, 31 Aug 2007 12:54:07 +0200 | |
changeset 5273 | 4287590a63af |
parent 3925 | 27230c29bfec |
permissions | -rw-r--r-- |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2109
diff
changeset
|
1 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
2 |
pushing to ../a |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
3 |
searching for changes |
3684
975c2469c316
correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents:
2424
diff
changeset
|
4 |
abort: push creates new remote branches! |
975c2469c316
correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents:
2424
diff
changeset
|
5 |
(did you forget to merge? use push -f to force) |
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
6 |
pulling from ../a |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
7 |
searching for changes |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
8 |
adding changesets |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
9 |
adding manifests |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
10 |
adding file changes |
1043 | 11 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1043
diff
changeset
|
12 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
13 |
pushing to ../a |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
14 |
searching for changes |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
15 |
abort: push creates new remote branches! |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
16 |
(did you forget to merge? use push -f to force) |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2109
diff
changeset
|
17 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2109
diff
changeset
|
18 |
(branch merge, don't forget to commit) |
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
19 |
pushing to ../a |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
20 |
searching for changes |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
21 |
adding changesets |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
22 |
adding manifests |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
23 |
adding file changes |
990 | 24 |
added 2 changesets with 1 changes to 1 files |
2021
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
25 |
adding foo |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2109
diff
changeset
|
26 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2109
diff
changeset
|
27 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2109
diff
changeset
|
28 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2021
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
29 |
merging foo |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2109
diff
changeset
|
30 |
0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2109
diff
changeset
|
31 |
(branch merge, don't forget to commit) |
2021
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
32 |
pushing to ../c |
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
33 |
searching for changes |
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
34 |
abort: push creates new remote branches! |
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
35 |
(did you forget to merge? use push -f to force) |
3797
2aef481ac73c
Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3684
diff
changeset
|
36 |
0 |
2021
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
37 |
pushing to ../c |
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
38 |
searching for changes |
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
39 |
no changes found |
3797
2aef481ac73c
Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3684
diff
changeset
|
40 |
0 |
2021
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
41 |
pushing to ../c |
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
42 |
searching for changes |
3684
975c2469c316
correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents:
2424
diff
changeset
|
43 |
abort: push creates new remote branches! |
975c2469c316
correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents:
2424
diff
changeset
|
44 |
(did you forget to merge? use push -f to force) |
3797
2aef481ac73c
Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3684
diff
changeset
|
45 |
0 |
2aef481ac73c
Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3684
diff
changeset
|
46 |
pushing to ../c |
2aef481ac73c
Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3684
diff
changeset
|
47 |
searching for changes |
2aef481ac73c
Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3684
diff
changeset
|
48 |
abort: push creates new remote branches! |
2aef481ac73c
Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3684
diff
changeset
|
49 |
(did you forget to merge? use push -f to force) |
2aef481ac73c
Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3684
diff
changeset
|
50 |
0 |
3684
975c2469c316
correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents:
2424
diff
changeset
|
51 |
pushing to ../c |
975c2469c316
correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents:
2424
diff
changeset
|
52 |
searching for changes |
2109
1b183976e007
Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents:
2021
diff
changeset
|
53 |
adding changesets |
1b183976e007
Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents:
2021
diff
changeset
|
54 |
adding manifests |
1b183976e007
Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents:
2021
diff
changeset
|
55 |
adding file changes |
1b183976e007
Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents:
2021
diff
changeset
|
56 |
added 2 changesets with 2 changes to 1 files (+2 heads) |
3797
2aef481ac73c
Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3684
diff
changeset
|
57 |
0 |
2021
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
58 |
pushing to ../c |
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
59 |
searching for changes |
2109
1b183976e007
Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents:
2021
diff
changeset
|
60 |
adding changesets |
1b183976e007
Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents:
2021
diff
changeset
|
61 |
adding manifests |
1b183976e007
Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents:
2021
diff
changeset
|
62 |
adding file changes |
2424
092039246d73
Report on push/pull if heads are merged, too, like for new heads.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2175
diff
changeset
|
63 |
added 1 changesets with 1 changes to 1 files (-1 heads) |
3797
2aef481ac73c
Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3684
diff
changeset
|
64 |
0 |
3925
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
65 |
pushing to ../e |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
66 |
searching for changes |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
67 |
adding changesets |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
68 |
adding manifests |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
69 |
adding file changes |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
70 |
added 1 changesets with 1 changes to 1 files |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
71 |
0 |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
72 |
pushing to ../e |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
73 |
searching for changes |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
74 |
adding changesets |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
75 |
adding manifests |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
76 |
adding file changes |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
77 |
added 1 changesets with 1 changes to 1 files |
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3797
diff
changeset
|
78 |
0 |