equal
deleted
inserted
replaced
18 |
18 |
19 create source repository |
19 create source repository |
20 |
20 |
21 $ hg init repo |
21 $ hg init repo |
22 $ cd repo |
22 $ cd repo |
23 $ echo '[ui]' > .hg/hgrc |
|
24 $ echo 'username= A. Foo <a.foo@bar.com>' >> .hg/hgrc |
|
25 $ echo a > a |
23 $ echo a > a |
26 $ echo b > b |
24 $ echo b > b |
27 $ hg ci -Am addfile |
25 $ hg ci -Am addfile |
28 adding a |
26 adding a |
29 adding b |
27 adding b |
45 adding file changes |
43 adding file changes |
46 added 1 changesets with 2 changes to 2 files |
44 added 1 changesets with 2 changes to 2 files |
47 updating to branch default |
45 updating to branch default |
48 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
46 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
49 $ cd clone |
47 $ cd clone |
50 $ echo '[ui]' >> .hg/hgrc |
|
51 $ echo 'username= A. Baz <a.baz@bar.com>' >> .hg/hgrc |
|
52 $ hg pull -q |
48 $ hg pull -q |
53 $ echo b >> b |
49 $ echo b >> b |
54 $ hg ci -m changeb |
50 $ hg ci -m changeb |
55 created new head |
51 created new head |
56 $ python -c "file('.hg/store/data/dummy.i', 'wb').write('a\nb\r\n')" |
52 $ python -c "file('.hg/store/data/dummy.i', 'wb').write('a\nb\r\n')" |