test-up-local-change.out
141 lines
| 3.4 KiB
| text/plain
|
TextLexer
/ tests / test-up-local-change.out
|
r767 | adding a | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r1933 | diff -r 33aaa84a386b a | ||
|
r331 | --- a/a | ||
+++ b/a | ||||
|
r1637 | @@ -1,1 +1,1 @@ a | ||
|
r331 | -a | ||
+abc | ||||
|
r767 | adding b | ||
|
r748 | M a | ||
|
r1933 | changeset: 0:33aaa84a386b | ||
|
r1674 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1674 | summary: 1 | ||
|
r331 | resolving manifests | ||
|
r3110 | overwrite False branchmerge False partial False | ||
|
r2979 | ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b | ||
|
r3121 | a: versions differ -> m | ||
b: remote created -> g | ||||
|
r331 | merging a | ||
resolving a | ||||
|
r3211 | my a@33aaa84a386b other a@802f095af299 ancestor a@33aaa84a386b | ||
|
r2977 | getting b | ||
|
r1922 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
|
r1933 | changeset: 1:802f095af299 | ||
|
r1674 | tag: tip | ||
user: test | ||||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1674 | summary: 2 | ||
|
r331 | resolving manifests | ||
|
r3110 | overwrite False branchmerge False partial False | ||
|
r2979 | ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b | ||
|
r3121 | b: remote deleted -> r | ||
|
r1674 | removing b | ||
|
r1922 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r1933 | changeset: 0:33aaa84a386b | ||
|
r1674 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1674 | summary: 1 | ||
|
r2915 | abort: there is nothing to merge - use "hg update" instead | ||
|
r1674 | failed | ||
|
r1933 | changeset: 0:33aaa84a386b | ||
|
r1674 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1674 | summary: 1 | ||
resolving manifests | ||||
|
r3110 | overwrite False branchmerge False partial False | ||
|
r2979 | ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b | ||
|
r3121 | a: versions differ -> m | ||
b: remote created -> g | ||||
|
r1674 | merging a | ||
resolving a | ||||
|
r3211 | my a@33aaa84a386b other a@802f095af299 ancestor a@33aaa84a386b | ||
|
r2977 | getting b | ||
|
r1922 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
|
r1933 | changeset: 1:802f095af299 | ||
|
r388 | tag: tip | ||
|
r331 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r331 | summary: 2 | ||
|
r2966 | changeset: 1:802f095af299 | ||
|
r388 | tag: tip | ||
|
r331 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r494 | files: a b | ||
|
r331 | description: | ||
2 | ||||
|
r546 | |||
|
r2966 | changeset: 0:33aaa84a386b | ||
|
r331 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r494 | files: a | ||
|
r331 | description: | ||
1 | ||||
|
r546 | |||
|
r1933 | diff -r 802f095af299 a | ||
|
r768 | --- a/a | ||
+++ b/a | ||||
|
r1637 | @@ -1,1 +1,1 @@ a2 | ||
|
r768 | -a2 | ||
+abc | ||||
|
r2175 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r1674 | adding b | ||
M a | ||||
|
r1933 | changeset: 1:802f095af299 | ||
|
r1674 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1674 | summary: 2 | ||
|
r2830 | abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes | ||
|
r1674 | failed | ||
|
r1995 | abort: outstanding uncommitted changes | ||
|
r1674 | failed | ||
resolving manifests | ||||
|
r3110 | overwrite False branchmerge True partial False | ||
|
r2979 | ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b | ||
|
r3121 | a: versions differ -> m | ||
b: versions differ -> m | ||||
|
r1674 | merging a | ||
resolving a | ||||
|
r3211 | my a@802f095af299 other a@030602aee63d ancestor a@33aaa84a386b | ||
|
r1674 | merging b | ||
resolving b | ||||
|
r3211 | my b@802f095af299 other b@030602aee63d ancestor b@000000000000 | ||
|
r1922 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
|
r1933 | changeset: 1:802f095af299 | ||
|
r1674 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1674 | summary: 2 | ||
|
r1933 | changeset: 2:030602aee63d | ||
|
r1674 | tag: tip | ||
|
r1933 | parent: 0:33aaa84a386b | ||
|
r1674 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1674 | summary: 3 | ||
|
r1933 | diff -r 802f095af299 a | ||
|
r1674 | --- a/a | ||
+++ b/a | ||||
@@ -1,1 +1,1 @@ a2 | ||||
-a2 | ||||
+abc | ||||
|
r2065 | adding a | ||
pulling from ../a | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r2973 | merging a | ||
0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||