Mercurial > hgbook
comparison en/examples/rename.divergent @ 156:91a936be78b8
Document merge behaviour with file names.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 12 Mar 2007 23:11:26 -0700 |
parents | |
children | 3b640272a966 |
comparison
equal
deleted
inserted
replaced
155:914babdc99c8 | 156:91a936be78b8 |
---|---|
1 #!/bin/bash | |
2 | |
3 hg init orig | |
4 cd orig | |
5 echo foo > foo | |
6 hg ci -A -m 'First commit' | |
7 cd .. | |
8 | |
9 #$ name: clone | |
10 | |
11 hg clone orig anne | |
12 hg clone orig bob | |
13 | |
14 #$ name: rename.anne | |
15 | |
16 cd anne | |
17 hg mv foo bar | |
18 hg ci -m 'Rename foo to bar' | |
19 | |
20 #$ name: rename.bob | |
21 | |
22 cd ../bob | |
23 hg mv foo quux | |
24 hg ci -m 'Rename foo to quux' | |
25 | |
26 #$ name: merge | |
27 # See http://www.selenic.com/mercurial/bts/issue455 | |
28 | |
29 cd ../orig | |
30 hg pull -u ../anne | |
31 hg pull ../bob | |
32 hg merge | |
33 ls |