test-up-local-change.out
65 lines
| 1.2 KiB
| text/plain
|
TextLexer
/ tests / test-up-local-change.out
|
r331 | + hg init | ||
+ hg addremove | ||||
|
r767 | adding a | ||
|
r801 | + hg commit -m 1 -d 0 0 | ||
|
r485 | + hg clone . ../r2 | ||
|
r331 | + hg up | ||
+ hg diff | ||||
|
r396 | diff -r c19d34741b0a a | ||
|
r331 | --- a/a | ||
+++ b/a | ||||
@@ -1,1 +1,1 @@ | ||||
-a | ||||
+abc | ||||
+ hg addremove | ||||
|
r767 | adding b | ||
|
r801 | + hg commit -m 2 -d 0 0 | ||
|
r331 | + hg -q pull ../r1 | ||
+ hg status | ||||
|
r748 | M a | ||
|
r591 | + hg --debug up | ||
|
r331 | resolving manifests | ||
|
r677 | force None allow None moddirstate True linear True | ||
|
r374 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e | ||
|
r331 | a versions differ, resolve | ||
remote created b | ||||
getting b | ||||
merging a | ||||
resolving a | ||||
|
r374 | file a: other d730145abbf9 ancestor b789fdd96dc2 | ||
|
r591 | + hg --debug up -m | ||
|
r331 | resolving manifests | ||
|
r677 | force None allow 1 moddirstate True linear True | ||
|
r374 | ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e | ||
|
r331 | + hg parents | ||
|
r784 | changeset: 1:1e71731e6fbb | ||
|
r388 | tag: tip | ||
|
r331 | user: test | ||
|
r382 | date: Thu Jan 1 00:00:00 1970 | ||
|
r331 | summary: 2 | ||
+ hg -v history | ||||
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | ||||
|
r388 | tag: tip | ||
|
r331 | user: test | ||
|
r382 | date: Thu Jan 1 00:00:00 1970 | ||
|
r494 | files: a b | ||
|
r331 | description: | ||
2 | ||||
|
r546 | |||
|
r331 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | ||
user: test | ||||
|
r382 | date: Thu Jan 1 00:00:00 1970 | ||
|
r494 | files: a | ||
|
r331 | description: | ||
1 | ||||
|
r546 | |||
|
r331 | + hg diff | ||
|
r768 | diff -r 1e71731e6fbb a | ||
--- a/a | ||||
+++ b/a | ||||
@@ -1,1 +1,1 @@ | ||||
-a2 | ||||
+abc | ||||