test-up-local-change.t
241 lines
| 5.6 KiB
| text/troff
|
Tads3Lexer
/ tests / test-up-local-change.t
|
r12120 | $ HGMERGE=true; export HGMERGE | ||
|
r13956 | $ hg init r1 | ||
|
r12120 | $ cd r1 | ||
$ echo a > a | ||||
$ hg addremove | ||||
adding a | ||||
|
r12156 | $ hg commit -m "1" | ||
|
r12120 | |||
$ hg clone . ../r2 | ||||
updating to branch default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd ../r2 | ||||
$ hg up | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo abc > a | ||||
$ hg diff --nodates | ||||
|
r12156 | diff -r c19d34741b0a a | ||
|
r12120 | --- a/a | ||
+++ b/a | ||||
@@ -1,1 +1,1 @@ | ||||
-a | ||||
+abc | ||||
$ cd ../r1 | ||||
$ echo b > b | ||||
$ echo a2 > a | ||||
$ hg addremove | ||||
adding b | ||||
|
r12156 | $ hg commit -m "2" | ||
|
r12120 | |||
$ cd ../r2 | ||||
$ hg -q pull ../r1 | ||||
$ hg status | ||||
M a | ||||
$ hg parents | ||||
|
r12156 | changeset: 0:c19d34741b0a | ||
|
r12120 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r12120 | summary: 1 | ||
$ hg --debug up | ||||
searching for copies back to rev 1 | ||||
unmatched files in other: | ||||
b | ||||
resolving manifests | ||||
|
r18605 | branchmerge: False, force: False, partial: False | ||
|
r15625 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb | ||
|
r21391 | preserving a for resolve of a | ||
|
r21389 | b: remote created -> g | ||
|
r18631 | getting b | ||
updating: b 1/2 files (50.00%) | ||||
|
r21391 | a: versions differ -> m | ||
|
r18631 | updating: a 2/2 files (100.00%) | ||
|
r12120 | picked tool 'true' for a (binary False symlink False) | ||
merging a | ||||
|
r12156 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | ||
|
r12120 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
$ hg parents | ||||
|
r12156 | changeset: 1:1e71731e6fbb | ||
|
r12120 | tag: tip | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r12120 | summary: 2 | ||
$ hg --debug up 0 | ||||
resolving manifests | ||||
|
r18605 | branchmerge: False, force: False, partial: False | ||
|
r15625 | ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a | ||
|
r21391 | preserving a for resolve of a | ||
|
r18541 | b: other deleted -> r | ||
|
r18631 | removing b | ||
|
r12120 | updating: b 1/2 files (50.00%) | ||
|
r21391 | a: versions differ -> m | ||
|
r12120 | updating: a 2/2 files (100.00%) | ||
picked tool 'true' for a (binary False symlink False) | ||||
merging a | ||||
|
r12156 | my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb | ||
|
r12120 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved | ||
$ hg parents | ||||
|
r12156 | changeset: 0:c19d34741b0a | ||
|
r12120 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r12120 | summary: 1 | ||
|
r12365 | $ hg --debug merge | ||
|
r15619 | abort: nothing to merge | ||
(use 'hg update' instead) | ||||
|
r12365 | [255] | ||
|
r12120 | $ hg parents | ||
|
r12156 | changeset: 0:c19d34741b0a | ||
|
r12120 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r12120 | summary: 1 | ||
$ hg --debug up | ||||
searching for copies back to rev 1 | ||||
unmatched files in other: | ||||
b | ||||
resolving manifests | ||||
|
r18605 | branchmerge: False, force: False, partial: False | ||
|
r15625 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb | ||
|
r21391 | preserving a for resolve of a | ||
|
r21389 | b: remote created -> g | ||
|
r18631 | getting b | ||
updating: b 1/2 files (50.00%) | ||||
|
r21391 | a: versions differ -> m | ||
|
r18631 | updating: a 2/2 files (100.00%) | ||
|
r12120 | picked tool 'true' for a (binary False symlink False) | ||
merging a | ||||
|
r12156 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | ||
|
r12120 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
$ hg parents | ||||
|
r12156 | changeset: 1:1e71731e6fbb | ||
|
r12120 | tag: tip | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r12120 | summary: 2 | ||
$ hg -v history | ||||
|
r12156 | changeset: 1:1e71731e6fbb | ||
|
r12120 | tag: tip | ||
user: test | ||||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r12120 | files: a b | ||
description: | ||||
2 | ||||
|
r12156 | changeset: 0:c19d34741b0a | ||
|
r12120 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r12120 | files: a | ||
description: | ||||
1 | ||||
$ hg diff --nodates | ||||
|
r12156 | diff -r 1e71731e6fbb a | ||
|
r12120 | --- a/a | ||
+++ b/a | ||||
@@ -1,1 +1,1 @@ | ||||
-a2 | ||||
+abc | ||||
create a second head | ||||
$ cd ../r1 | ||||
$ hg up 0 | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo b2 > b | ||||
$ echo a3 > a | ||||
$ hg addremove | ||||
adding b | ||||
|
r12156 | $ hg commit -m "3" | ||
|
r12120 | created new head | ||
$ cd ../r2 | ||||
$ hg -q pull ../r1 | ||||
$ hg status | ||||
M a | ||||
$ hg parents | ||||
|
r12156 | changeset: 1:1e71731e6fbb | ||
|
r12120 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r12120 | summary: 2 | ||
|
r12365 | $ hg --debug up | ||
|
r19800 | abort: uncommitted changes | ||
(commit and merge, or update --clean to discard changes) | ||||
|
r12365 | [255] | ||
$ hg --debug merge | ||||
|
r19802 | abort: uncommitted changes | ||
|
r15619 | (use 'hg status' to list changes) | ||
|
r12365 | [255] | ||
|
r12120 | $ hg --debug merge -f | ||
searching for copies back to rev 1 | ||||
|
r20641 | unmatched files new in both: | ||
b | ||||
|
r12120 | resolving manifests | ||
|
r18605 | branchmerge: True, force: True, partial: False | ||
|
r15625 | ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 | ||
|
r21391 | preserving a for resolve of a | ||
preserving b for resolve of b | ||||
|
r12120 | a: versions differ -> m | ||
updating: a 1/2 files (50.00%) | ||||
picked tool 'true' for a (binary False symlink False) | ||||
merging a | ||||
|
r12156 | my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a | ||
|
r23396 | b: both created -> m | ||
|
r12120 | updating: b 2/2 files (100.00%) | ||
picked tool 'true' for b (binary False symlink False) | ||||
merging b | ||||
|
r12156 | my b@1e71731e6fbb+ other b@83c51d0caff4 ancestor b@000000000000 | ||
|
r12120 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
$ hg parents | ||||
|
r12156 | changeset: 1:1e71731e6fbb | ||
|
r12120 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r12120 | summary: 2 | ||
|
r12156 | changeset: 2:83c51d0caff4 | ||
|
r12120 | tag: tip | ||
|
r12156 | parent: 0:c19d34741b0a | ||
|
r12120 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r12120 | summary: 3 | ||
$ hg diff --nodates | ||||
|
r12156 | diff -r 1e71731e6fbb a | ||
|
r12120 | --- a/a | ||
+++ b/a | ||||
@@ -1,1 +1,1 @@ | ||||
-a2 | ||||
+abc | ||||
test a local add | ||||
$ cd .. | ||||
$ hg init a | ||||
$ hg init b | ||||
$ echo a > a/a | ||||
$ echo a > b/a | ||||
$ hg --cwd a commit -A -m a | ||||
adding a | ||||
$ cd b | ||||
$ hg add a | ||||
$ hg pull -u ../a | ||||
pulling from ../a | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg st | ||||
|
r16913 | |||
$ cd .. | ||||