Mercurial > hg
annotate tests/test-rename-dir-merge2.t @ 12113:d171000cf6f8
tests: unify test-rename-dir-merge2
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Mon, 30 Aug 2010 13:51:27 +0900 |
parents | tests/test-rename-dir-merge2@c95060a5391a |
children |
rev | line source |
---|---|
12113
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
1 $ mkdir r1 |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
2 $ cd r1 |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
3 $ hg init |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
4 $ mkdir a |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
5 $ echo foo > a/f |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
6 $ hg add a |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
7 adding a/f |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
8 $ hg ci -m "a/f == foo" |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
9 $ cd .. |
4115
c95060a5391a
merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 |
12113
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
11 $ hg clone r1 r2 |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
12 updating to branch default |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
14 $ cd r2 |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
15 $ hg mv a b |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
16 moving a/f to b/f |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
17 $ echo foo1 > b/f |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
18 $ hg ci -m" a -> b, b/f == foo1" |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
19 $ cd .. |
4115
c95060a5391a
merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
20 |
12113
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
21 $ cd r1 |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
22 $ mkdir a/aa |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
23 $ echo bar > a/aa/g |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
24 $ hg add a/aa |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
25 adding a/aa/g |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
26 $ hg ci -m "a/aa/g" |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
27 $ hg pull ../r2 |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
28 pulling from ../r2 |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
29 searching for changes |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
30 adding changesets |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
31 adding manifests |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
32 adding file changes |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
33 added 1 changesets with 1 changes to 1 files (+1 heads) |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
34 (run 'hg heads' to see heads, 'hg merge' to merge) |
4115
c95060a5391a
merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
35 |
12113
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
36 $ hg merge |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
37 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
38 (branch merge, don't forget to commit) |
4115
c95060a5391a
merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
39 |
12113
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
40 $ hg st -C |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
41 M b/f |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
42 A b/aa/g |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
43 a/aa/g |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
44 R a/aa/g |
d171000cf6f8
tests: unify test-rename-dir-merge2
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4115
diff
changeset
|
45 R a/f |