Mercurial > hg

annotate tests/test-push-warn.out @ 3696:562a65635bcb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: better detection of renames when comparing with the working dir.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 20 Nov 2006 19:32:38 -0200
parents 975c2469c316
children 2aef481ac73c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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
9344f5dd4488 Update tests
mpm@selenic.com
parents: 990
diff changeset
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
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 925
diff changeset
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)
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
36 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
37 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
38 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
39 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
40 searching for changes
3684
975c2469c316 correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents: 2424
diff changeset
41 abort: push creates new remote branches!
975c2469c316 correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents: 2424
diff changeset
42 (did you forget to merge? use push -f to force)
975c2469c316 correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents: 2424
diff changeset
43 pushing to ../c
975c2469c316 correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents: 2424
diff changeset
44 searching for changes
2109
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
45 adding changesets
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
46 adding manifests
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
47 adding file changes
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
48 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
49 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
50 searching for changes
2109
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
51 adding changesets
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
52 adding manifests
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset
53 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
54 added 1 changesets with 1 changes to 1 files (-1 heads)