test-up-local-change.out
72 lines
| 1.4 KiB
| text/plain
|
TextLexer
/ tests / test-up-local-change.out
|
r331 | + mkdir r1 | ||
+ cd r1 | ||||
+ hg init | ||||
+ echo a | ||||
+ hg addremove | ||||
+ hg commit -t 1 -u test -d '0 0' | ||||
|
r485 | + hg clone . ../r2 | ||
+ cd ../r2 | ||||
|
r331 | + hg up | ||
+ echo abc | ||||
+ hg diff | ||||
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/' | ||||
|
r396 | diff -r c19d34741b0a a | ||
|
r331 | --- a/a | ||
+++ b/a | ||||
@@ -1,1 +1,1 @@ | ||||
-a | ||||
+abc | ||||
+ cd ../r1 | ||||
+ echo b | ||||
+ echo a2 | ||||
+ hg addremove | ||||
+ hg commit -t 2 -u test -d '0 0' | ||||
+ cd ../r2 | ||||
+ hg -q pull ../r1 | ||||
+ hg status | ||||
C a | ||||
+ hg -d up | ||||
resolving manifests | ||||
|
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 | ||
|
r331 | + hg -d up -m | ||
resolving manifests | ||||
|
r374 | ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e | ||
|
r331 | + hg parents | ||
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | ||||
|
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 | manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 | ||
user: test | ||||
|
r382 | date: Thu Jan 1 00:00:00 1970 | ||
|
r331 | files: a b | ||
description: | ||||
2 | ||||
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | ||||
manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | ||||
user: test | ||||
|
r382 | date: Thu Jan 1 00:00:00 1970 | ||
|
r331 | files: a | ||
description: | ||||
1 | ||||
+ hg diff | ||||
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/' | ||||
|
r396 | diff -r 1e71731e6fbb a | ||
|
r331 | --- a/a | ||
+++ b/a | ||||
@@ -1,1 +1,1 @@ | ||||
-a2 | ||||
+abc | ||||