test-up-local-change.t
249 lines
| 5.9 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 | ||||
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 | ||
|
r26618 | a: versions differ -> m (premerge) | ||
|
r27161 | picked tool 'true' for a (binary False symlink False changedelete False) | ||
|
r12120 | merging a | ||
|
r12156 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | ||
|
r26618 | a: versions differ -> m (merge) | ||
|
r27161 | picked tool 'true' for a (binary False symlink False changedelete False) | ||
|
r26611 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | ||
launching merge tool: true *$TESTTMP/r2/a* * * (glob) | ||||
|
r24727 | merge tool returned: 0 | ||
|
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 | ||||
|
r30200 | starting 4 threads for background file closing (?) | ||
|
r12120 | 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 | ||
|
r28318 | starting 4 threads for background file closing (?) | ||
|
r26618 | a: versions differ -> m (premerge) | ||
|
r27161 | picked tool 'true' for a (binary False symlink False changedelete False) | ||
|
r12120 | merging a | ||
|
r12156 | my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb | ||
|
r26618 | a: versions differ -> m (merge) | ||
|
r27161 | picked tool 'true' for a (binary False symlink False changedelete False) | ||
|
r26611 | my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb | ||
launching merge tool: true *$TESTTMP/r2/a* * * (glob) | ||||
|
r24727 | merge tool returned: 0 | ||
|
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 | ||
$ hg --debug up | ||||
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 | ||
|
r26618 | a: versions differ -> m (premerge) | ||
|
r27161 | picked tool 'true' for a (binary False symlink False changedelete False) | ||
|
r12120 | merging a | ||
|
r12156 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | ||
|
r26618 | a: versions differ -> m (merge) | ||
|
r27161 | picked tool 'true' for a (binary False symlink False changedelete False) | ||
|
r26611 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | ||
launching merge tool: true *$TESTTMP/r2/a* * * (glob) | ||||
|
r24727 | merge tool returned: 0 | ||
|
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 | ||
|
r28065 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r32698 | updated to "1e71731e6fbb: 2" | ||
|
r28065 | 1 other heads for branch "default" | ||
|
r12120 | |||
|
r23477 | test conflicting untracked files | ||
$ hg up -qC 0 | ||||
$ echo untracked > b | ||||
$ hg st | ||||
? b | ||||
$ hg up 1 | ||||
b: untracked file differs | ||||
abort: untracked files in working directory differ from files in requested revision | ||||
[255] | ||||
$ rm b | ||||
test conflicting untracked ignored file | ||||
$ hg up -qC 0 | ||||
$ echo ignored > .hgignore | ||||
$ hg add .hgignore | ||||
$ hg ci -m 'add .hgignore' | ||||
created new head | ||||
$ echo ignored > ignored | ||||
$ hg add ignored | ||||
$ hg ci -m 'add ignored file' | ||||
$ hg up -q 'desc("add .hgignore")' | ||||
$ echo untracked > ignored | ||||
$ hg st | ||||
$ hg up 'desc("add ignored file")' | ||||
|
r23478 | ignored: untracked file differs | ||
abort: untracked files in working directory differ from files in requested revision | ||||
[255] | ||||
|
r23477 | |||
|
r12120 | 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 | ||||
|
r34662 | new changesets cb9a9f314b8b | ||
|
r12120 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
$ hg st | ||||
|
r16913 | |||
|
r30200 | test updating backwards through a rename | ||
$ hg mv a b | ||||
$ hg ci -m b | ||||
$ echo b > b | ||||
$ hg up -q 0 | ||||
$ hg st | ||||
M a | ||||
$ hg diff --nodates | ||||
diff -r cb9a9f314b8b a | ||||
--- a/a | ||||
+++ b/a | ||||
@@ -1,1 +1,1 @@ | ||||
-a | ||||
+b | ||||
|
r30229 | test for superfluous filemerge of clean files renamed in the past | ||
$ hg up -qC tip | ||||
$ echo c > c | ||||
$ hg add c | ||||
$ hg up -qt:fail 0 | ||||
|
r16913 | $ cd .. | ||