Mercurial > hg > pyhgsh

annotate tests/test-push-warn.out @ 2109:1b183976e007

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert push new heads logic This breaks push -r's new head detection but fixes the common case. For now we'll assume that someone doing push -r knows what they're doing.
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Apr 2006 16:30:23 -0500
parents fc22ed56afe3
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
1 pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
2 searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
3 abort: unsynced remote changes!
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
4 (did you forget to sync? use push -f to force)
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
5 pulling from ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
6 searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
7 adding changesets
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
8 adding manifests
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
9 adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 990
diff changeset
10 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
11 (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
12 pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
13 searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
14 abort: push creates new remote branches!
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
15 (did you forget to merge? use push -f to force)
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
16 pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
17 searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
18 adding changesets
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
19 adding manifests
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset
20 adding file changes
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 925
diff changeset
21 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
22 adding foo
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
23 merging foo
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
24 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
25 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
26 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
27 (did you forget to merge? use push -f to force)
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
28 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
29 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
30 no changes found
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
31 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
32 searching for changes
2109
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
33 adding changesets
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
34 adding manifests
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
35 adding file changes
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
36 added 2 changesets with 2 changes to 1 files (+2 heads)
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
2109
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
39 adding changesets
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
40 adding manifests
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
41 adding file changes
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
42 added 1 changesets with 1 changes to 1 files