Mercurial > hg
annotate tests/test-convert-bzr-treeroot.t @ 23444:88629daa727b
merge: demonstrate that directory renames can lose local file content
When a directory has been renamed on the local branch and a file has
been added in the old location on a remote branch, we move that new
file to the new location. Unfortunately, if there is already a file
there, we overwrite it with the contents from the remote branch. For
untracked local files, we should probably abort, and for tracked local
files, we should merge the contents. To start with, let's add a test
to demonstrate the breakage. Also note that while files merged in from
a remote branch are normally (and unintuitively) reported as modified,
these files are reported as added.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 02 Dec 2014 13:28:07 -0800 |
parents | f2719b387380 |
children | 89872688893f |
rev | line source |
---|---|
7053 | 1 |
12517
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
2 $ . "$TESTDIR/bzr-definitions" |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
3 $ cat > treeset.py <<EOF |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
4 > import sys |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
5 > from bzrlib import workingtree |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
6 > wt = workingtree.WorkingTree.open('.') |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
7 > |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
8 > message, rootid = sys.argv[1:] |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
9 > wt.set_root_id('tree_root-%s' % rootid) |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
10 > wt.commit(message) |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
11 > EOF |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
12 |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
13 change the id of the tree root |
7053 | 14 |
12517
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
15 $ mkdir test-change-treeroot-id |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
16 $ cd test-change-treeroot-id |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
17 $ bzr init -q source |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
18 $ cd source |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
19 $ echo content > file |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
20 $ bzr add -q file |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
21 $ bzr commit -q -m 'Initial add' |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
22 $ python ../../treeset.py 'Changed root' new |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
23 $ cd .. |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
24 $ hg convert source source-hg |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
25 initializing destination source-hg repository |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
26 scanning source... |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
27 sorting... |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
28 converting... |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
29 1 Initial add |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
30 0 Changed root |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
31 $ manifest source-hg tip |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
32 % manifest of tip |
cc8f1083e8be
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com>
parents:
7058
diff
changeset
|
33 644 file |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12517
diff
changeset
|
34 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12517
diff
changeset
|
35 $ cd .. |