Mercurial > hg
comparison tests/test-simple-update.t @ 12279:28e2e3804f2e
combine tests
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Tue, 14 Sep 2010 12:20:51 +0200 |
parents | tests/test-simple-update@ad3d5b4367cb |
children | 22f3353bcc36 |
comparison
equal
deleted
inserted
replaced
12278:c4c2ba553401 | 12279:28e2e3804f2e |
---|---|
1 $ set -e | |
2 | |
3 $ mkdir test | |
4 $ cd test | |
5 $ echo foo>foo | |
6 $ hg init | |
7 $ hg addremove | |
8 adding foo | |
9 $ hg commit -m "1" | |
10 | |
11 $ hg verify | |
12 checking changesets | |
13 checking manifests | |
14 crosschecking files in changesets and manifests | |
15 checking files | |
16 1 files, 1 changesets, 1 total revisions | |
17 | |
18 $ hg clone . ../branch | |
19 updating to branch default | |
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
21 $ cd ../branch | |
22 $ hg co | |
23 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
24 $ echo bar>>foo | |
25 $ hg commit -m "2" | |
26 | |
27 $ cd ../test | |
28 | |
29 $ hg pull ../branch | |
30 pulling from ../branch | |
31 searching for changes | |
32 adding changesets | |
33 adding manifests | |
34 adding file changes | |
35 added 1 changesets with 1 changes to 1 files | |
36 (run 'hg update' to get a working copy) | |
37 | |
38 $ hg verify | |
39 checking changesets | |
40 checking manifests | |
41 crosschecking files in changesets and manifests | |
42 checking files | |
43 1 files, 2 changesets, 2 total revisions | |
44 | |
45 $ hg co | |
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
47 | |
48 $ cat foo | |
49 foo | |
50 bar | |
51 | |
52 $ hg manifest --debug | |
53 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo | |
54 |