Skip to content
Snippets Groups Projects
Commit d845b05e2209 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

test-copies: add 3 new files with their own content

The new `p`, `q` and `r` file mirror the `a`, `b` and `h` but with different
content for each files. This will be used to create "mirror" test case that
involve actual merge happening.

For now, we only add the file to keep patches small and easier to review.

Differential Revision: https://phab.mercurial-scm.org/D10053
parent b00b762f4c67
No related branches found
No related tags found
No related merge requests found
......@@ -75,7 +75,10 @@
$ cp ../same-content.txt a
$ cp ../same-content.txt b
$ cp ../same-content.txt h
$ echo "original content for P" > p
$ echo "original content for Q" > q
$ echo "original content for R" > r
$ hg ci -Am 'i-0 initial commit: a b h'
adding a
adding b
adding h
......@@ -78,7 +81,10 @@
$ hg ci -Am 'i-0 initial commit: a b h'
adding a
adding b
adding h
adding p
adding q
adding r
$ hg mv a c
$ hg ci -Am 'i-1: a -move-> c'
$ hg mv c d
......@@ -652,7 +658,7 @@
$ case_desc="simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch)"
$ hg up 'desc("i-0")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv b d
$ hg ci -m "h-1: b -(move)-> d"
created new head
......@@ -1228,6 +1234,9 @@
added : a, ;
added : b, ;
added : h, ;
added : p, ;
added : q, ;
added : r, ;
$ for rev in `hg log --rev 'all()' -T '{rev}\n'`; do
> case_id=`hg log -r $rev -T '{word(0, desc, ":")}\n'`
......@@ -1237,8 +1246,8 @@
> done
##### revision "i-0 initial commit" #####
1 sidedata entries
entry-0014 size 34
'\x00\x00\x00\x03\x04\x00\x00\x00\x01\x00\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\x00\x04\x00\x00\x00\x03\x00\x00\x00\x00abh'
entry-0014 size 64
'\x00\x00\x00\x06\x04\x00\x00\x00\x01\x00\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\x00\x04\x00\x00\x00\x03\x00\x00\x00\x00\x04\x00\x00\x00\x04\x00\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\x00\x04\x00\x00\x00\x06\x00\x00\x00\x00abhpqr'
added : a, ;
added : b, ;
added : h, ;
......@@ -1242,6 +1251,9 @@
added : a, ;
added : b, ;
added : h, ;
added : p, ;
added : q, ;
added : r, ;
##### revision "i-1" #####
1 sidedata entries
entry-0014 size 24
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment