Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 3044:fcadf7a32425

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
date Sun, 03 Sep 2006 06:06:02 -0400
parents 87a0332ab58b
children 92a0c2200e41
comparison
equal deleted inserted replaced
3043:2a4d4aecb2b4 3044:fcadf7a32425
1 (the addremove command is deprecated; use add and remove --after instead)
2 adding a 1 adding a
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 diff -r 33aaa84a386b a 4 diff -r 33aaa84a386b a
6 --- a/a 5 --- a/a
7 +++ b/a 6 +++ b/a
8 @@ -1,1 +1,1 @@ a 7 @@ -1,1 +1,1 @@ a
9 -a 8 -a
10 +abc 9 +abc
11 (the addremove command is deprecated; use add and remove --after instead)
12 adding b 10 adding b
13 M a 11 M a
14 changeset: 0:33aaa84a386b 12 changeset: 0:33aaa84a386b
15 user: test 13 user: test
16 date: Mon Jan 12 13:46:40 1970 +0000 14 date: Mon Jan 12 13:46:40 1970 +0000
17 summary: 1 15 summary: 1
18 16
19 resolving manifests 17 resolving manifests
20 force None allow None moddirstate True linear True 18 overwrite False branchmerge False partial False linear True
21 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e 19 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
22 a versions differ, resolve 20 a versions differ, resolve
23 remote created b 21 remote created b
24 getting b
25 merging a 22 merging a
26 resolving a 23 resolving a
27 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 24 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
25 getting b
28 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
29 changeset: 1:802f095af299 27 changeset: 1:802f095af299
30 tag: tip 28 tag: tip
31 user: test 29 user: test
32 date: Mon Jan 12 13:46:40 1970 +0000 30 date: Mon Jan 12 13:46:40 1970 +0000
33 summary: 2 31 summary: 2
34 32
35 resolving manifests 33 resolving manifests
36 force None allow None moddirstate True linear True 34 overwrite False branchmerge False partial False linear True
37 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c 35 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
38 remote deleted b 36 remote deleted b
39 removing b 37 removing b
40 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 38 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
41 changeset: 0:33aaa84a386b 39 changeset: 0:33aaa84a386b
42 user: test 40 user: test
43 date: Mon Jan 12 13:46:40 1970 +0000 41 date: Mon Jan 12 13:46:40 1970 +0000
44 summary: 1 42 summary: 1
45 43
46 abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' 44 abort: there is nothing to merge - use "hg update" instead
47 failed 45 failed
48 changeset: 0:33aaa84a386b 46 changeset: 0:33aaa84a386b
49 user: test 47 user: test
50 date: Mon Jan 12 13:46:40 1970 +0000 48 date: Mon Jan 12 13:46:40 1970 +0000
51 summary: 1 49 summary: 1
52 50
53 resolving manifests 51 resolving manifests
54 force None allow None moddirstate True linear True 52 overwrite False branchmerge False partial False linear True
55 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e 53 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
56 a versions differ, resolve 54 a versions differ, resolve
57 remote created b 55 remote created b
58 getting b
59 merging a 56 merging a
60 resolving a 57 resolving a
61 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 58 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
59 getting b
62 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 60 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
63 changeset: 1:802f095af299 61 changeset: 1:802f095af299
64 tag: tip 62 tag: tip
65 user: test 63 user: test
66 date: Mon Jan 12 13:46:40 1970 +0000 64 date: Mon Jan 12 13:46:40 1970 +0000
67 summary: 2 65 summary: 2
68 66
69 changeset: 1:802f095af299cde27a85b2f056aef3829870956c 67 changeset: 1:802f095af299
70 tag: tip 68 tag: tip
71 user: test 69 user: test
72 date: Mon Jan 12 13:46:40 1970 +0000 70 date: Mon Jan 12 13:46:40 1970 +0000
73 files: a b 71 files: a b
74 description: 72 description:
75 2 73 2
76 74
77 75
78 changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1 76 changeset: 0:33aaa84a386b
79 user: test 77 user: test
80 date: Mon Jan 12 13:46:40 1970 +0000 78 date: Mon Jan 12 13:46:40 1970 +0000
81 files: a 79 files: a
82 description: 80 description:
83 1 81 1
88 +++ b/a 86 +++ b/a
89 @@ -1,1 +1,1 @@ a2 87 @@ -1,1 +1,1 @@ a2
90 -a2 88 -a2
91 +abc 89 +abc
92 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 90 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
93 (the addremove command is deprecated; use add and remove --after instead)
94 adding b 91 adding b
95 M a 92 M a
96 changeset: 1:802f095af299 93 changeset: 1:802f095af299
97 user: test 94 user: test
98 date: Mon Jan 12 13:46:40 1970 +0000 95 date: Mon Jan 12 13:46:40 1970 +0000
99 summary: 2 96 summary: 2
100 97
101 resolving manifests 98 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
102 force None allow None moddirstate True linear False
103 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
104 a versions differ, resolve
105 b versions differ, resolve
106 this update spans a branch affecting the following files:
107 a (resolve)
108 b (resolve)
109 aborting update spanning branches!
110 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
111 failed 99 failed
112 abort: outstanding uncommitted changes 100 abort: outstanding uncommitted changes
113 failed 101 failed
114 resolving manifests 102 resolving manifests
115 force False allow True moddirstate True linear False 103 overwrite False branchmerge True partial False linear False
116 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 104 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
117 a versions differ, resolve 105 a versions differ, resolve
118 b versions differ, resolve 106 b versions differ, resolve
119 merging a 107 merging a
120 resolving a 108 resolving a
147 requesting all changes 135 requesting all changes
148 adding changesets 136 adding changesets
149 adding manifests 137 adding manifests
150 adding file changes 138 adding file changes
151 added 1 changesets with 1 changes to 1 files 139 added 1 changesets with 1 changes to 1 files
152 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 140 merging a
141 0 files updated, 1 files merged, 0 files removed, 0 files unresolved