Show More
@@ -1,131 +1,124 b'' | |||
|
1 | 1 | #!/bin/sh -e |
|
2 | 2 | |
|
3 | 3 | LANG="C"; export LANG |
|
4 | 4 | LC_CTYPE="C"; export LC_CTYPE |
|
5 | 5 | LC_NUMERIC="C"; export LC_NUMERIC |
|
6 | 6 | LC_TIME="C"; export LC_TIME |
|
7 | 7 | LC_COLLATE="C"; export LC_COLLATE |
|
8 | 8 | LC_MONETARY="C"; export LC_MONETARY |
|
9 | 9 | LC_MESSAGES="C"; export LC_MESSAGES |
|
10 | 10 | LC_PAPER="C"; export LC_PAPER |
|
11 | 11 | LC_NAME="C"; export LC_NAME |
|
12 | 12 | LC_ADDRESS="C"; export LC_ADDRESS |
|
13 | 13 | LC_TELEPHONE="C"; export LC_TELEPHONE |
|
14 | 14 | LC_MEASUREMENT="C"; export LC_MEASUREMENT |
|
15 | 15 | LC_IDENTIFICATION="C"; export LC_IDENTIFICATION |
|
16 | 16 | LC_ALL=""; export LC_ALL |
|
17 | 17 | TZ=GMT; export TZ |
|
18 | 18 | HGEDITOR=true; export HGEDITOR |
|
19 | 19 | HGMERGE=true; export HGMERGE |
|
20 | 20 | HGUSER="test"; export HGUSER |
|
21 | 21 | |
|
22 | 22 | umask 022 |
|
23 | 23 | |
|
24 | 24 | tests=0 |
|
25 | 25 | failed=0 |
|
26 | 26 | |
|
27 | 27 | HGTMP="" |
|
28 | 28 | cleanup_exit() { |
|
29 | 29 | rm -rf "$HGTMP" |
|
30 | 30 | } |
|
31 | 31 | |
|
32 | 32 | # Remove temporary files even if we get interrupted |
|
33 | 33 | trap "cleanup_exit" 0 # normal exit |
|
34 | 34 | trap "exit 255" 1 2 3 6 15 # HUP INT QUIT ABRT TERM |
|
35 | 35 | |
|
36 | 36 | HGTMP="${TMPDIR-/tmp}/hgtests.$RANDOM.$RANDOM.$RANDOM.$$" |
|
37 | 37 | (umask 077 && mkdir "$HGTMP") || { |
|
38 | 38 | echo "Could not create temporary directory! Exiting." 1>&2 |
|
39 | 39 | exit 1 |
|
40 | 40 | } |
|
41 | 41 | |
|
42 | 42 | TESTDIR="$PWD" |
|
43 | 43 | |
|
44 | 44 | if [ -d /usr/lib64 ]; then |
|
45 | 45 | lib=lib64 |
|
46 | 46 | else |
|
47 | 47 | lib=lib |
|
48 | 48 | fi |
|
49 | 49 | |
|
50 | 50 | INST="$HGTMP/install" |
|
51 | 51 | cd .. |
|
52 | 52 | if ${PYTHON-python} setup.py install --home="$INST" > tests/install.err 2>&1 |
|
53 | 53 | then |
|
54 | 54 | rm tests/install.err |
|
55 | mv "$INST/bin/hg" "$INST/bin/hg.real" | |
|
56 | ( | |
|
57 | echo '#!/bin/sh' | |
|
58 | echo 'echo "+ hg $@"' | |
|
59 | echo 'exec hg.real "$@"' | |
|
60 | ) > "$INST/bin/hg" | |
|
61 | chmod 755 "$INST/bin/hg" | |
|
62 | 55 | else |
|
63 | 56 | cat tests/install.err |
|
64 | 57 | exit 1 |
|
65 | 58 | fi |
|
66 | 59 | cd "$TESTDIR" |
|
67 | 60 | |
|
68 | 61 | PATH="$INST/bin:$PATH"; export PATH |
|
69 | 62 | PYTHONPATH="$INST/$lib/python"; export PYTHONPATH |
|
70 | 63 | |
|
71 | 64 | |
|
72 | 65 | run_one() { |
|
73 | 66 | rm -f "$1.err" |
|
74 | 67 | |
|
75 | 68 | mkdir "$HGTMP/$1" |
|
76 | 69 | cd "$HGTMP/$1" |
|
77 | 70 | fail=0 |
|
78 | 71 | HOME="$HGTMP/$1"; export HOME |
|
79 | 72 | OUT="$HGTMP/$1.out" |
|
80 | 73 | OUTOK="$TESTDIR/$1.out" |
|
81 | 74 | ERR="$TESTDIR/$1.err" |
|
82 | 75 | |
|
83 | 76 | if "$TESTDIR/$1" > "$OUT" 2>&1; then |
|
84 | 77 | : no error |
|
85 | 78 | else |
|
86 | 79 | echo "$1 failed with error code $?" |
|
87 | 80 | fail=1 |
|
88 | 81 | fi |
|
89 | 82 | |
|
90 | 83 | if [ -s "$OUT" -a ! -s "$OUTOK" ] ; then |
|
91 | 84 | cp "$OUT" "$ERR" |
|
92 | 85 | echo |
|
93 | 86 | echo "$1 generated unexpected output:" |
|
94 | 87 | cat "$ERR" |
|
95 | 88 | fail=1 |
|
96 | 89 | elif [ -r "$OUTOK" ]; then |
|
97 | 90 | if diff -u "$OUTOK" "$OUT" > /dev/null; then |
|
98 | 91 | : no differences |
|
99 | 92 | else |
|
100 | 93 | cp "$OUT" "$ERR" |
|
101 | 94 | echo |
|
102 | 95 | echo "$1 output changed:" |
|
103 | 96 | diff -u "$OUTOK" "$ERR" || true |
|
104 | 97 | fail=1 |
|
105 | 98 | fi |
|
106 | 99 | fi |
|
107 | 100 | |
|
108 | 101 | cd "$TESTDIR" |
|
109 | 102 | rm -f "$HGTMP/$1.out" |
|
110 | 103 | rm -rf "$HGTMP/$1" |
|
111 | 104 | return $fail |
|
112 | 105 | } |
|
113 | 106 | |
|
114 | 107 | TESTS="$*" |
|
115 | 108 | if [ -z "$TESTS" ] ; then |
|
116 | 109 | TESTS=`ls test-* | grep -v "[.~]"` |
|
117 | 110 | fi |
|
118 | 111 | |
|
119 | 112 | for f in $TESTS ; do |
|
120 | 113 | echo -n "." |
|
121 | 114 | run_one $f || failed=`expr $failed + 1` |
|
122 | 115 | tests=`expr $tests + 1` |
|
123 | 116 | done |
|
124 | 117 | |
|
125 | 118 | echo |
|
126 | 119 | echo "Ran $tests tests, $failed failed." |
|
127 | 120 | |
|
128 | 121 | if [ $failed -gt 0 ] ; then |
|
129 | 122 | exit 1 |
|
130 | 123 | fi |
|
131 | 124 | exit 0 |
@@ -1,8 +1,2 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
4 | 1 | a |
|
5 | + hg add b | |
|
6 | + hg commit -m commit #1 -d 0 0 | |
|
7 | + hg co 0 | |
|
8 | 2 | a |
@@ -1,9 +1,7 b'' | |||
|
1 | + hg clone http://localhost:20059/ copy | |
|
2 | 1 | requesting all changes |
|
3 | 2 | abort: error: Connection refused |
|
4 | 3 | 255 |
|
5 | 4 | ls: copy: No such file or directory |
|
6 | + hg clone http://localhost:20059/foo copy2 | |
|
7 | 5 | requesting all changes |
|
8 | 6 | abort: HTTP Error 404: File not found |
|
9 | 7 | 255 |
@@ -1,20 +1,13 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m test -d 0 0 | |
|
4 | + hg history | |
|
5 | 1 | changeset: 0:acb14030fe0a |
|
6 | 2 | tag: tip |
|
7 | 3 | user: test |
|
8 | 4 | date: Thu Jan 1 00:00:00 1970 |
|
9 | 5 | summary: test |
|
10 | 6 | |
|
11 | + hg manifest | |
|
12 | 7 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a |
|
13 | + hg cat a | |
|
14 | 8 | a |
|
15 | + hg verify | |
|
16 | 9 | checking changesets |
|
17 | 10 | checking manifests |
|
18 | 11 | crosschecking files in changesets and manifests |
|
19 | 12 | checking files |
|
20 | 13 | 1 files, 1 changesets, 1 total revisions |
@@ -1,20 +1,12 b'' | |||
|
1 | + hg clone a b | |
|
2 | 1 | abort: repository a/.hg not found! |
|
3 | 2 | 255 |
|
4 | + hg clone http://127.0.0.1:3121/a b | |
|
5 | 3 | requesting all changes |
|
6 | 4 | abort: error: Connection refused |
|
7 | 5 | 255 |
|
8 | + hg clone a b | |
|
9 | 6 | abort: repository a/.hg not found! |
|
10 | 7 | 255 |
|
11 | + hg init | |
|
12 | + hg clone . ../a | |
|
13 | 8 | abort: destination '../a' already exists |
|
14 | 9 | 1 |
|
15 | + hg clone a b | |
|
16 | 10 | abort: repository a/.hg not found! |
|
17 | 11 | 255 |
|
18 | + hg init | |
|
19 | + hg clone q | |
|
20 | 12 | abort: destination 'q' already exists |
@@ -1,22 +1,13 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m test -d 0 0 | |
|
4 | + hg clone . ../b | |
|
5 | 1 | a |
|
6 | + hg verify | |
|
7 | 2 | checking changesets |
|
8 | 3 | checking manifests |
|
9 | 4 | crosschecking files in changesets and manifests |
|
10 | 5 | checking files |
|
11 | 6 | 1 files, 1 changesets, 1 total revisions |
|
12 | + hg clone -U . ../c | |
|
13 | 7 | cat: a: No such file or directory |
|
14 | + hg verify | |
|
15 | 8 | checking changesets |
|
16 | 9 | checking manifests |
|
17 | 10 | crosschecking files in changesets and manifests |
|
18 | 11 | checking files |
|
19 | 12 | 1 files, 1 changesets, 1 total revisions |
|
20 | + hg clone ../a | |
|
21 | + hg cat a | |
|
22 | 13 | a |
@@ -1,17 +1,8 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m ancestor -d 0 0 | |
|
4 | + hg commit -m branch1 -d 0 0 | |
|
5 | + hg co 0 | |
|
6 | + hg commit -m branch2 -d 0 0 | |
|
7 | + hg up -m 1 | |
|
8 | 1 | merge: warning: conflicts during merge |
|
9 | 2 | merging a |
|
10 | 3 | merging a failed! |
|
11 | + hg id | |
|
12 | 4 | 32e80765d7fe+75234512624c+ tip |
|
13 | 5 | something else |
|
14 | 6 | ======= |
|
15 | 7 | something |
|
16 | + hg status | |
|
17 | 8 | M a |
@@ -1,37 +1,27 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m 1 -d 0 0 | |
|
4 | + hg status | |
|
5 | + hg copy a b | |
|
6 | + hg status | |
|
7 | 1 | A b |
|
8 | + hg --debug commit -m 2 -d 0 0 | |
|
9 | 2 | b |
|
10 | 3 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
11 | + hg history | |
|
12 | 4 | changeset: 1:3b5b84850bbe |
|
13 | 5 | tag: tip |
|
14 | 6 | user: test |
|
15 | 7 | date: Thu Jan 1 00:00:00 1970 |
|
16 | 8 | summary: 2 |
|
17 | 9 | |
|
18 | 10 | changeset: 0:c19d34741b0a |
|
19 | 11 | user: test |
|
20 | 12 | date: Thu Jan 1 00:00:00 1970 |
|
21 | 13 | summary: 1 |
|
22 | 14 | |
|
23 | + hg log a | |
|
24 | 15 | changeset: 0:c19d34741b0a |
|
25 | 16 | user: test |
|
26 | 17 | date: Thu Jan 1 00:00:00 1970 |
|
27 | 18 | summary: 1 |
|
28 | 19 | |
|
29 | 20 | 566e338d09a089ba737c21e0d3759980 .hg/data/b.d |
|
30 | 3268d2f51b2d2d423ff01b59eb6fbb14 bsum | |
|
31 | 70909ca2ecf494c71e9184b445e040ee asum | |
|
32 | + hg verify | |
|
21 | 60b725f10c9c85c70d97880dfe8191b3 bsum | |
|
22 | 60b725f10c9c85c70d97880dfe8191b3 asum | |
|
33 | 23 | checking changesets |
|
34 | 24 | checking manifests |
|
35 | 25 | crosschecking files in changesets and manifests |
|
36 | 26 | checking files |
|
37 | 27 | 2 files, 2 changesets, 2 total revisions |
@@ -1,16 +1,10 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg ci -m a -d 0 0 | |
|
4 | + hg add b | |
|
5 | + hg diff | |
|
6 | 1 | diff -r 3903775176ed b |
|
7 | 2 | --- /dev/null |
|
8 | 3 | +++ b/b |
|
9 | 4 | @@ -0,0 +1,1 @@ |
|
10 | 5 | +123 |
|
11 | + hg diff -r tip | |
|
12 | 6 | diff -r 3903775176ed b |
|
13 | 7 | --- /dev/null |
|
14 | 8 | +++ b/b |
|
15 | 9 | @@ -0,0 +1,1 @@ |
|
16 | 10 | +123 |
@@ -1,9 +1,3 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m first -d 0 0 a | |
|
4 | + hg add sub/b | |
|
5 | + hg commit -m second -d 0 0 sub/b | |
|
6 | 1 | 321 |
|
7 | + hg co 0 | |
|
8 | 2 | cat: sub/b: No such file or directory |
|
9 | 3 | ls: sub: No such file or directory |
@@ -1,60 +1,48 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a b | |
|
3 | + hg ci -m added a b -d 0 0 | |
|
4 | + hg init | |
|
5 | + hg pull ../test1 | |
|
6 | 1 | pulling from ../test1 |
|
7 | 2 | requesting all changes |
|
8 | 3 | adding changesets |
|
9 | 4 | adding manifests |
|
10 | 5 | adding file changes |
|
11 | 6 | added 1 changesets with 2 changes to 2 files |
|
12 | 7 | (run 'hg update' to get a working copy) |
|
13 | + hg co | |
|
14 | + hg ci -m chmod +x a -d 0 0 | |
|
15 | + hg ci -m a updated -d 0 0 | |
|
16 | + hg pull ../test2 | |
|
17 | 8 | pulling from ../test2 |
|
18 | 9 | searching for changes |
|
19 | 10 | adding changesets |
|
20 | 11 | adding manifests |
|
21 | 12 | adding file changes |
|
22 | 13 | added 1 changesets with 1 changes to 1 files |
|
23 | 14 | (run 'hg update' to get a working copy) |
|
24 | + hg heads | |
|
25 | 15 | changeset: 2:3ef543305655 |
|
26 | 16 | tag: tip |
|
27 | 17 | parent: 0:22a449e20da5 |
|
28 | 18 | user: test |
|
29 | 19 | date: Thu Jan 1 00:00:00 1970 |
|
30 | 20 | summary: chmod +x a |
|
31 | 21 | |
|
32 | 22 | changeset: 1:c6ecefc45368 |
|
33 | 23 | user: test |
|
34 | 24 | date: Thu Jan 1 00:00:00 1970 |
|
35 | 25 | summary: a updated |
|
36 | 26 | |
|
37 | + hg history | |
|
38 | 27 | changeset: 2:3ef543305655 |
|
39 | 28 | tag: tip |
|
40 | 29 | parent: 0:22a449e20da5 |
|
41 | 30 | user: test |
|
42 | 31 | date: Thu Jan 1 00:00:00 1970 |
|
43 | 32 | summary: chmod +x a |
|
44 | 33 | |
|
45 | 34 | changeset: 1:c6ecefc45368 |
|
46 | 35 | user: test |
|
47 | 36 | date: Thu Jan 1 00:00:00 1970 |
|
48 | 37 | summary: a updated |
|
49 | 38 | |
|
50 | 39 | changeset: 0:22a449e20da5 |
|
51 | 40 | user: test |
|
52 | 41 | date: Thu Jan 1 00:00:00 1970 |
|
53 | 42 | summary: added a b |
|
54 | 43 | |
|
55 | + hg -v co -m | |
|
56 | 44 | resolving manifests |
|
57 | 45 | merging a |
|
58 | 46 | resolving a |
|
59 | 47 | -rwxr-x--- |
|
60 | 48 | -rwxr-x--- |
@@ -1,221 +1,212 b'' | |||
|
1 | + hg | |
|
2 | 1 | Mercurial Distributed SCM |
|
3 | 2 | |
|
4 | 3 | basic commands (use "hg help" for the full list or option "-v" for details): |
|
5 | 4 | |
|
6 | 5 | add add the specified files on the next commit |
|
7 | 6 | annotate show changeset information per file line |
|
8 | 7 | clone make a copy of an existing repository |
|
9 | 8 | commit commit the specified files or all outstanding changes |
|
10 | 9 | diff diff working directory (or selected files) |
|
11 | 10 | export dump the header and diffs for one or more changesets |
|
12 | 11 | init create a new repository in the given directory |
|
13 | 12 | log show the revision history of the repository or a single file |
|
14 | 13 | pull pull changes from the specified source |
|
15 | 14 | push push changes to the specified destination |
|
16 | 15 | remove remove the specified files on the next commit |
|
17 | 16 | revert revert modified files or dirs back to their unmodified states |
|
18 | 17 | serve export the repository via HTTP |
|
19 | 18 | status show changed files in the working directory |
|
20 | 19 | update update or merge working directory |
|
21 | + hg -q | |
|
22 | 20 | add add the specified files on the next commit |
|
23 | 21 | annotate show changeset information per file line |
|
24 | 22 | clone make a copy of an existing repository |
|
25 | 23 | commit commit the specified files or all outstanding changes |
|
26 | 24 | diff diff working directory (or selected files) |
|
27 | 25 | export dump the header and diffs for one or more changesets |
|
28 | 26 | init create a new repository in the given directory |
|
29 | 27 | log show the revision history of the repository or a single file |
|
30 | 28 | pull pull changes from the specified source |
|
31 | 29 | push push changes to the specified destination |
|
32 | 30 | remove remove the specified files on the next commit |
|
33 | 31 | revert revert modified files or dirs back to their unmodified states |
|
34 | 32 | serve export the repository via HTTP |
|
35 | 33 | status show changed files in the working directory |
|
36 | 34 | update update or merge working directory |
|
37 | + hg help | |
|
38 | 35 | Mercurial Distributed SCM |
|
39 | 36 | |
|
40 | 37 | list of commands (use "hg help -v" to show aliases and global options): |
|
41 | 38 | |
|
42 | 39 | add add the specified files on the next commit |
|
43 | 40 | addremove add all new files, delete all missing files |
|
44 | 41 | annotate show changeset information per file line |
|
45 | 42 | cat output the latest or given revision of a file |
|
46 | 43 | clone make a copy of an existing repository |
|
47 | 44 | commit commit the specified files or all outstanding changes |
|
48 | 45 | copy mark a file as copied or renamed for the next commit |
|
49 | 46 | diff diff working directory (or selected files) |
|
50 | 47 | export dump the header and diffs for one or more changesets |
|
51 | 48 | forget don't add the specified files on the next commit |
|
52 | 49 | heads show current repository heads |
|
53 | 50 | help show help for a given command or all commands |
|
54 | 51 | identify print information about the working copy |
|
55 | 52 | import import an ordered set of patches |
|
56 | 53 | init create a new repository in the given directory |
|
57 | 54 | locate locate files matching specific patterns |
|
58 | 55 | log show the revision history of the repository or a single file |
|
59 | 56 | manifest output the latest or given revision of the project manifest |
|
57 | outgoing show changesets not found in destination | |
|
60 | 58 | parents show the parents of the working dir or revision |
|
61 | paths show path or list of available paths | |
|
59 | paths show definition of symbolic path names | |
|
62 | 60 | pull pull changes from the specified source |
|
63 | 61 | push push changes to the specified destination |
|
64 | 62 | rawcommit raw commit interface |
|
65 | 63 | recover roll back an interrupted transaction |
|
66 | 64 | remove remove the specified files on the next commit |
|
67 | 65 | revert revert modified files or dirs back to their unmodified states |
|
68 | 66 | root print the root (top) of the current working dir |
|
69 | 67 | serve export the repository via HTTP |
|
70 | 68 | status show changed files in the working directory |
|
71 | 69 | tag add a tag for the current tip or a given revision |
|
72 | 70 | tags list repository tags |
|
73 | 71 | tip show the tip revision |
|
74 | 72 | undo undo the last commit or pull |
|
75 | 73 | update update or merge working directory |
|
76 | 74 | verify verify the integrity of the repository |
|
77 | 75 | version output version and copyright information |
|
78 | + hg -q help | |
|
79 | 76 | add add the specified files on the next commit |
|
80 | 77 | addremove add all new files, delete all missing files |
|
81 | 78 | annotate show changeset information per file line |
|
82 | 79 | cat output the latest or given revision of a file |
|
83 | 80 | clone make a copy of an existing repository |
|
84 | 81 | commit commit the specified files or all outstanding changes |
|
85 | 82 | copy mark a file as copied or renamed for the next commit |
|
86 | 83 | diff diff working directory (or selected files) |
|
87 | 84 | export dump the header and diffs for one or more changesets |
|
88 | 85 | forget don't add the specified files on the next commit |
|
89 | 86 | heads show current repository heads |
|
90 | 87 | help show help for a given command or all commands |
|
91 | 88 | identify print information about the working copy |
|
92 | 89 | import import an ordered set of patches |
|
93 | 90 | init create a new repository in the given directory |
|
94 | 91 | locate locate files matching specific patterns |
|
95 | 92 | log show the revision history of the repository or a single file |
|
96 | 93 | manifest output the latest or given revision of the project manifest |
|
94 | outgoing show changesets not found in destination | |
|
97 | 95 | parents show the parents of the working dir or revision |
|
98 | paths show path or list of available paths | |
|
96 | paths show definition of symbolic path names | |
|
99 | 97 | pull pull changes from the specified source |
|
100 | 98 | push push changes to the specified destination |
|
101 | 99 | rawcommit raw commit interface |
|
102 | 100 | recover roll back an interrupted transaction |
|
103 | 101 | remove remove the specified files on the next commit |
|
104 | 102 | revert revert modified files or dirs back to their unmodified states |
|
105 | 103 | root print the root (top) of the current working dir |
|
106 | 104 | serve export the repository via HTTP |
|
107 | 105 | status show changed files in the working directory |
|
108 | 106 | tag add a tag for the current tip or a given revision |
|
109 | 107 | tags list repository tags |
|
110 | 108 | tip show the tip revision |
|
111 | 109 | undo undo the last commit or pull |
|
112 | 110 | update update or merge working directory |
|
113 | 111 | verify verify the integrity of the repository |
|
114 | 112 | version output version and copyright information |
|
115 | + hg add -h | |
|
116 | 113 | hg add: option -h not recognized |
|
117 | 114 | hg add [OPTION]... [FILE]... |
|
118 | 115 | |
|
119 | 116 | add the specified files on the next commit |
|
120 | 117 | |
|
121 | 118 | options: |
|
122 | 119 | |
|
123 | 120 | -I --include |
|
124 | 121 | include path in search |
|
125 | 122 | -X --exclude |
|
126 | 123 | exclude path from search |
|
127 | + hg add --skjdfks | |
|
128 | 124 | hg add: option --skjdfks not recognized |
|
129 | 125 | hg add [OPTION]... [FILE]... |
|
130 | 126 | |
|
131 | 127 | add the specified files on the next commit |
|
132 | 128 | |
|
133 | 129 | options: |
|
134 | 130 | |
|
135 | 131 | -I --include |
|
136 | 132 | include path in search |
|
137 | 133 | -X --exclude |
|
138 | 134 | exclude path from search |
|
139 | + hg help diff | |
|
140 | 135 | hg diff [-I] [-X] [-r REV1 [-r REV2]] [FILE]... |
|
141 | 136 | |
|
142 | 137 | diff working directory (or selected files) |
|
143 | 138 | |
|
144 | 139 | options: |
|
145 | 140 | |
|
146 | 141 | -r --rev |
|
147 | 142 | revision |
|
148 | 143 | -I --include |
|
149 | 144 | include path in search |
|
150 | 145 | -X --exclude |
|
151 | 146 | exclude path from search |
|
152 | + hg help status | |
|
153 | 147 | hg status [OPTION]... [FILE]... |
|
154 | 148 | |
|
155 | 149 | show changed files in the working directory |
|
156 | 150 | |
|
157 | 151 | M = modified |
|
158 | 152 | A = added |
|
159 | 153 | R = removed |
|
160 | 154 | ? = not tracked |
|
161 | 155 | |
|
162 | 156 | options: |
|
163 | 157 | |
|
164 | 158 | -m --modified |
|
165 | 159 | show only modified files |
|
166 | 160 | -a --added |
|
167 | 161 | show only added files |
|
168 | 162 | -r --removed |
|
169 | 163 | show only removed files |
|
170 | 164 | -u --unknown |
|
171 | 165 | show only unknown (not tracked) files |
|
172 | 166 | -I --include |
|
173 | 167 | include path in search |
|
174 | 168 | -X --exclude |
|
175 | 169 | exclude path from search |
|
176 | + hg -q help status | |
|
177 | 170 | hg status [OPTION]... [FILE]... |
|
178 | 171 | |
|
179 | 172 | show changed files in the working directory |
|
180 | + hg help foo | |
|
181 | 173 | hg: unknown command 'foo' |
|
182 | 174 | Mercurial Distributed SCM |
|
183 | 175 | |
|
184 | 176 | basic commands (use "hg help" for the full list or option "-v" for details): |
|
185 | 177 | |
|
186 | 178 | add add the specified files on the next commit |
|
187 | 179 | annotate show changeset information per file line |
|
188 | 180 | clone make a copy of an existing repository |
|
189 | 181 | commit commit the specified files or all outstanding changes |
|
190 | 182 | diff diff working directory (or selected files) |
|
191 | 183 | export dump the header and diffs for one or more changesets |
|
192 | 184 | init create a new repository in the given directory |
|
193 | 185 | log show the revision history of the repository or a single file |
|
194 | 186 | pull pull changes from the specified source |
|
195 | 187 | push push changes to the specified destination |
|
196 | 188 | remove remove the specified files on the next commit |
|
197 | 189 | revert revert modified files or dirs back to their unmodified states |
|
198 | 190 | serve export the repository via HTTP |
|
199 | 191 | status show changed files in the working directory |
|
200 | 192 | update update or merge working directory |
|
201 | + hg skjdfks | |
|
202 | 193 | hg: unknown command 'skjdfks' |
|
203 | 194 | Mercurial Distributed SCM |
|
204 | 195 | |
|
205 | 196 | basic commands (use "hg help" for the full list or option "-v" for details): |
|
206 | 197 | |
|
207 | 198 | add add the specified files on the next commit |
|
208 | 199 | annotate show changeset information per file line |
|
209 | 200 | clone make a copy of an existing repository |
|
210 | 201 | commit commit the specified files or all outstanding changes |
|
211 | 202 | diff diff working directory (or selected files) |
|
212 | 203 | export dump the header and diffs for one or more changesets |
|
213 | 204 | init create a new repository in the given directory |
|
214 | 205 | log show the revision history of the repository or a single file |
|
215 | 206 | pull pull changes from the specified source |
|
216 | 207 | push push changes to the specified destination |
|
217 | 208 | remove remove the specified files on the next commit |
|
218 | 209 | revert revert modified files or dirs back to their unmodified states |
|
219 | 210 | serve export the repository via HTTP |
|
220 | 211 | status show changed files in the working directory |
|
221 | 212 | update update or merge working directory |
@@ -1,5 +1,2 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m test -d 0 0 | |
|
4 | 1 | precommit hook |
|
5 | 2 | commit hook: acb14030fe0a21b60322c440ad2d20cf7685a376 |
@@ -1,12 +1,10 b'' | |||
|
1 | + hg init | |
|
2 | + hg serve --stdio | |
|
3 | 1 | 0 |
|
4 | 2 | 0 |
|
5 | 3 | adding changesets |
|
6 | 4 | killed! |
|
7 | 5 | transaction abort! |
|
8 | 6 | rollback completed |
|
9 | 7 | 00changelog.d |
|
10 | 8 | 00changelog.i |
|
11 | 9 | data |
|
12 | 10 | journal.dirstate |
@@ -1,46 +1,12 b'' | |||
|
1 | + hg init | |
|
2 | + hg add file1 file2 | |
|
3 | + hg commit -m added file1 and file2 -d 0 0 -u user | |
|
4 | + hg commit -m changed file1 -d 0 0 -u user | |
|
5 | + hg -q log | |
|
6 | 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c | |
|
7 | 0:8633637036c18f021d771208e16ae3508ab81d28 | |
|
8 | + hg id | |
|
1 | 1:3aa14bbc23d9 | |
|
2 | 0:8633637036c1 | |
|
9 | 3 | 3aa14bbc23d9 tip |
|
10 | + hg update -C 0 | |
|
11 | + hg id | |
|
12 | 4 | 8633637036c1 |
|
13 | + hg id | |
|
14 | 5 | 8633637036c1+ |
|
15 | + hg revert | |
|
16 | + hg diff | |
|
17 | + hg status | |
|
18 | + hg id | |
|
19 | 6 | 8633637036c1 |
|
20 | + hg update | |
|
21 | + hg diff | |
|
22 | + hg status | |
|
23 | + hg id | |
|
24 | 7 | 3aa14bbc23d9 tip |
|
25 | + hg update -C 0 | |
|
26 | + hg update | |
|
27 | 8 | merging file1 |
|
28 | + hg diff | |
|
29 | + hg status | |
|
30 | + hg id | |
|
31 | 9 | 3aa14bbc23d9 tip |
|
32 | + hg revert | |
|
33 | + hg diff | |
|
34 | + hg status | |
|
35 | + hg id | |
|
10 | 3aa14bbc23d9 tip | |
|
36 | 11 | 3aa14bbc23d9 tip |
|
37 | + hg revert -r tip | |
|
38 | + hg diff | |
|
39 | + hg status | |
|
40 | + hg id | |
|
41 | 12 | 3aa14bbc23d9 tip |
|
42 | + hg update -C | |
|
43 | + hg diff | |
|
44 | + hg status | |
|
45 | + hg id | |
|
46 | 3aa14bbc23d9 tip |
@@ -1,60 +1,26 b'' | |||
|
1 | + hg init | |
|
2 | + hg add file1 file2 | |
|
3 | + hg commit -m added file1 and file2 -d 0 0 -u user | |
|
4 | + hg commit -m changed file1 -d 0 0 -u user | |
|
5 | + hg -q log | |
|
6 | 1:f4d7a8c73d231bc078e2a5e791325e55e8a4c252 | |
|
7 | 0:232e179b3f294d467cfa66e1439bc5b0d44e4a93 | |
|
8 | + hg id | |
|
1 | 1:f4d7a8c73d23 | |
|
2 | 0:232e179b3f29 | |
|
9 | 3 | f4d7a8c73d23 tip |
|
10 | + hg update -C 0 | |
|
11 | + hg id | |
|
12 | 4 | 232e179b3f29 |
|
13 | + hg id | |
|
14 | 5 | 232e179b3f29+ |
|
15 | + hg revert | |
|
16 | + hg diff | |
|
17 | + hg status | |
|
18 | + hg id | |
|
19 | 6 | 232e179b3f29 |
|
20 | + hg update | |
|
21 | + hg diff | |
|
22 | + hg status | |
|
23 | + hg id | |
|
24 | 7 | f4d7a8c73d23 tip |
|
25 | + hg update -C 0 | |
|
26 | + hg update | |
|
27 | 8 | merge: warning: conflicts during merge |
|
28 | 9 | merging file1 |
|
29 | 10 | merging file1 failed! |
|
30 | + hg diff | |
|
31 | 11 | diff -r f4d7a8c73d23 file1 |
|
32 | 12 | --- a/file1 |
|
33 | 13 | +++ b/file1 |
|
34 | 14 | @@ -1,3 +1,7 @@ |
|
35 | 15 | added file1 |
|
36 | 16 | another line of text |
|
37 | 17 | +<<<<<<< |
|
38 | 18 | +changed file1 different |
|
39 | 19 | +======= |
|
40 | 20 | changed file1 |
|
41 | 21 | +>>>>>>> |
|
42 | + hg status | |
|
43 | 22 | M file1 |
|
44 | + hg id | |
|
45 | 23 | f4d7a8c73d23+ tip |
|
46 | + hg revert | |
|
47 | + hg diff | |
|
48 | + hg status | |
|
49 | + hg id | |
|
50 | 24 | f4d7a8c73d23 tip |
|
51 | + hg revert -r tip | |
|
52 | + hg diff | |
|
53 | + hg status | |
|
54 | + hg id | |
|
55 | 25 | f4d7a8c73d23 tip |
|
56 | + hg update -C | |
|
57 | + hg diff | |
|
58 | + hg status | |
|
59 | + hg id | |
|
60 | 26 | f4d7a8c73d23 tip |
@@ -1,45 +1,7 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
4 | + hg add b | |
|
5 | + hg commit -m commit #1 -d 0 0 | |
|
6 | + hg update 0 | |
|
7 | + hg add c | |
|
8 | + hg commit -m commit #2 -d 0 0 | |
|
9 | + hg update -m 1 | |
|
10 | + hg init | |
|
11 | + hg add a | |
|
12 | + hg commit -m commit #0 -d 0 0 | |
|
13 | + hg add b | |
|
14 | + hg commit -m commit #1 -d 0 0 | |
|
15 | + hg update 0 | |
|
16 | + hg add c | |
|
17 | + hg commit -m commit #2 -d 0 0 | |
|
18 | + hg update -m 1 | |
|
19 | 1 | merging for b |
|
20 | 2 | merging b |
|
21 | + hg init | |
|
22 | + hg add a | |
|
23 | + hg commit -m commit #0 -d 0 0 | |
|
24 | + hg add b | |
|
25 | + hg commit -m commit #1 -d 0 0 | |
|
26 | + hg commit -m commit #2 -d 0 0 | |
|
27 | + hg update 1 | |
|
28 | + hg add c | |
|
29 | + hg commit -m commit #3 -d 0 0 | |
|
30 | 3 | This is file b1 |
|
31 | + hg update -m 2 | |
|
32 | 4 | merging for b |
|
33 | 5 | merging b |
|
34 | + hg init | |
|
35 | + hg add a | |
|
36 | + hg commit -m commit #0 -d 0 0 | |
|
37 | + hg add b | |
|
38 | + hg commit -m commit #1 -d 0 0 | |
|
39 | + hg commit -m commit #2 -d 0 0 | |
|
40 | + hg update 1 | |
|
41 | + hg add c | |
|
42 | + hg commit -m commit #3 -d 0 0 | |
|
43 | + hg update -m 2 | |
|
44 | 6 | merging for b |
|
45 | 7 | merging b |
@@ -1,25 +1,2 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
4 | + hg add b | |
|
5 | + hg commit -m commit #1 -d 0 0 | |
|
6 | + hg update 0 | |
|
7 | + hg add b | |
|
8 | + hg commit -m commit #2 -d 0 0 | |
|
9 | + hg init | |
|
10 | + hg add a | |
|
11 | + hg commit -m commit #0 -d 0 0 | |
|
12 | + hg add b | |
|
13 | + hg commit -m commit #1 -d 0 0 | |
|
14 | + hg update 0 | |
|
15 | + hg commit -A -m commit #2 -d 0 0 | |
|
16 | 1 | adding b |
|
17 | + hg init | |
|
18 | + hg add a | |
|
19 | + hg commit -m commit #0 -d 0 0 | |
|
20 | + hg add b | |
|
21 | + hg commit -m commit #1 -d 0 0 | |
|
22 | + hg remove b | |
|
23 | + hg update 0 | |
|
24 | + hg commit -A -m commit #2 -d 0 0 | |
|
25 | 2 | adding b |
@@ -1,8 +1,3 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
4 | + hg add b | |
|
5 | + hg commit -A -mcomment #1 -d 0 0 | |
|
6 | 1 | removing b |
|
7 | 2 | b never committed! |
|
8 | 3 | nothing changed |
@@ -1,10 +0,0 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
4 | + hg add b | |
|
5 | + hg commit -m commit #1 -d 0 0 | |
|
6 | + hg update 0 | |
|
7 | + hg add c | |
|
8 | + hg commit -m commit #2 -d 0 0 | |
|
9 | + hg update -m 1 | |
|
10 | + hg commit -m commit #3 -d 0 0 |
@@ -1,12 +1,5 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a b | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
4 | + hg commit -mcomment #1 -d 0 0 | |
|
5 | + hg update 0 | |
|
6 | + hg commit -A -mcomment #2 -d 0 0 | |
|
7 | 1 | removing b |
|
8 | + hg update 1 | |
|
9 | 2 | this update spans a branch affecting the following files: |
|
10 | 3 | b |
|
11 | 4 | aborting update spanning branches! |
|
12 | 5 | (use update -m to merge across branches or -C to lose changes) |
@@ -1,35 +1,18 b'' | |||
|
1 | + hg init | |
|
2 | + hg add foo bar | |
|
3 | + hg commit -m commit text -d 0 0 | |
|
4 | + hg clone A1 B1 | |
|
5 | + hg remove bar | |
|
6 | + hg commit -m commit test -d 0 0 | |
|
7 | + hg commit -m commit test -d 0 0 | |
|
8 | + hg clone A1 A2 | |
|
9 | + hg clone B1 B2 | |
|
10 | + hg pull ../B1 | |
|
11 | 1 | pulling from ../B1 |
|
12 | 2 | searching for changes |
|
13 | 3 | adding changesets |
|
14 | 4 | adding manifests |
|
15 | 5 | adding file changes |
|
16 | 6 | added 1 changesets with 1 changes to 1 files |
|
17 | 7 | (run 'hg update' to get a working copy) |
|
18 | + hg update -m | |
|
19 | + hg commit -m commit test -d 0 0 | |
|
20 | 8 | bar should remain deleted. |
|
21 | + hg manifest | |
|
22 | 9 | 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |
|
23 | + hg pull ../A2 | |
|
24 | 10 | pulling from ../A2 |
|
25 | 11 | searching for changes |
|
26 | 12 | adding changesets |
|
27 | 13 | adding manifests |
|
28 | 14 | adding file changes |
|
29 | 15 | added 1 changesets with 0 changes to 0 files |
|
30 | 16 | (run 'hg update' to get a working copy) |
|
31 | + hg update -m | |
|
32 | + hg commit -m commit test -d 0 0 | |
|
33 | 17 | bar should remain deleted. |
|
34 | + hg manifest | |
|
35 | 18 | 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |
@@ -1,9 +1,6 b'' | |||
|
1 | + hg init | |
|
2 | 1 | Is there an error message when trying to diff non-existing files? |
|
3 | + hg diff not found | |
|
4 | 2 | not: No such file or directory |
|
5 | 3 | found: No such file or directory |
|
6 | 4 | Is there an error message when trying to add non-existing files? |
|
7 | + hg add not found | |
|
8 | 5 | not: No such file or directory |
|
9 | 6 | found: No such file or directory |
@@ -1,31 +1,22 b'' | |||
|
1 | + hg init | |
|
2 | + hg addremove | |
|
3 | 1 | adding foo |
|
4 | + hg commit -m 1 | |
|
5 | + hg verify | |
|
6 | 2 | checking changesets |
|
7 | 3 | checking manifests |
|
8 | 4 | crosschecking files in changesets and manifests |
|
9 | 5 | checking files |
|
10 | 6 | 1 files, 1 changesets, 1 total revisions |
|
11 | + hg clone http://localhost:20059/ copy | |
|
12 | 7 | requesting all changes |
|
13 | 8 | adding changesets |
|
14 | 9 | adding manifests |
|
15 | 10 | adding file changes |
|
16 | 11 | added 1 changesets with 1 changes to 1 files |
|
17 | + hg verify | |
|
18 | 12 | checking changesets |
|
19 | 13 | checking manifests |
|
20 | 14 | crosschecking files in changesets and manifests |
|
21 | 15 | checking files |
|
22 | 16 | 1 files, 1 changesets, 1 total revisions |
|
23 | + hg co | |
|
24 | 17 | foo |
|
25 | + hg manifest | |
|
26 | 18 | 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
|
27 | + hg pull | |
|
28 | 19 | pulling from http://localhost:20059/ |
|
29 | 20 | searching for changes |
|
30 | 21 | no changes found |
|
31 | 22 | killed! |
@@ -1,35 +1,21 b'' | |||
|
1 | + hg init | |
|
2 | + hg add t1 | |
|
3 | + hg commit -m 1 -d 0 0 | |
|
4 | + hg clone a b | |
|
5 | + hg add t2 | |
|
6 | + hg commit -m 2 -d 0 0 | |
|
7 | + hg add t3 | |
|
8 | + hg commit -m 3 -d 0 0 | |
|
9 | + hg push ../a | |
|
10 | 1 | pushing to ../a |
|
11 | 2 | searching for changes |
|
12 | 3 | abort: unsynced remote changes! |
|
13 | 4 | (did you forget to sync? use push -f to force) |
|
14 | + hg pull ../a | |
|
15 | 5 | pulling from ../a |
|
16 | 6 | searching for changes |
|
17 | 7 | adding changesets |
|
18 | 8 | adding manifests |
|
19 | 9 | adding file changes |
|
20 | 10 | added 1 changesets with 1 changes to 1 files |
|
21 | 11 | (run 'hg update' to get a working copy) |
|
22 | + hg push ../a | |
|
23 | 12 | pushing to ../a |
|
24 | 13 | searching for changes |
|
25 | 14 | abort: push creates new remote branches! |
|
26 | 15 | (did you forget to merge? use push -f to force) |
|
27 | + hg up -m | |
|
28 | + hg commit -m 4 -d 0 0 | |
|
29 | + hg push ../a | |
|
30 | 16 | pushing to ../a |
|
31 | 17 | searching for changes |
|
32 | 18 | adding changesets |
|
33 | 19 | adding manifests |
|
34 | 20 | adding file changes |
|
35 | 21 | added 2 changesets with 2 changes to 2 files |
@@ -1,77 +1,53 b'' | |||
|
1 | + hg --debug init | |
|
2 | + hg add a | |
|
3 | + hg commit -m0 -d 0 0 | |
|
4 | + hg add b | |
|
5 | + hg commit -m1 -d 0 0 | |
|
6 | + hg manifest 1 | |
|
7 | 1 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
8 | 2 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
|
9 | + hg rawcommit -p 1 -d 0 0 -m2 c | |
|
10 | + hg manifest 2 | |
|
11 | 3 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
12 | 4 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
|
13 | 5 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
14 | + hg parents | |
|
15 | 6 | changeset: 2:9f827976dae4 |
|
16 | 7 | tag: tip |
|
17 | 8 | user: test |
|
18 | 9 | date: Thu Jan 1 00:00:00 1970 |
|
19 | 10 | summary: 2 |
|
20 | 11 | |
|
21 | + hg rawcommit -p 2 -d 0 0 -m3 b | |
|
22 | + hg manifest 3 | |
|
23 | 12 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
24 | 13 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
25 | + hg parents | |
|
26 | 14 | changeset: 3:c8225a106186 |
|
27 | 15 | tag: tip |
|
28 | 16 | user: test |
|
29 | 17 | date: Thu Jan 1 00:00:00 1970 |
|
30 | 18 | summary: 3 |
|
31 | 19 | |
|
32 | + hg rawcommit -p 3 -d 0 0 -m4 a | |
|
33 | + hg manifest 4 | |
|
34 | 20 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
35 | 21 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
36 | + hg parents | |
|
37 | 22 | changeset: 4:8dfeee82a94b |
|
38 | 23 | tag: tip |
|
39 | 24 | user: test |
|
40 | 25 | date: Thu Jan 1 00:00:00 1970 |
|
41 | 26 | summary: 4 |
|
42 | 27 | |
|
43 | + hg rawcommit -p 1 -d 0 0 -m5 c | |
|
44 | + hg manifest 5 | |
|
45 | 28 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
46 | 29 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
|
47 | 30 | 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c |
|
48 | + hg parents | |
|
49 | 31 | changeset: 4:8dfeee82a94b |
|
50 | 32 | user: test |
|
51 | 33 | date: Thu Jan 1 00:00:00 1970 |
|
52 | 34 | summary: 4 |
|
53 | 35 | |
|
54 | + hg rawcommit -p 4 -p 5 -d 0 0 -m6 | |
|
55 | + hg manifest 6 | |
|
56 | 36 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
57 | 37 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
58 | + hg parents | |
|
59 | 38 | changeset: 6:c0e932ecae5e |
|
60 | 39 | tag: tip |
|
61 | 40 | parent: 4:8dfeee82a94b |
|
62 | 41 | parent: 5:a7925a42d0df |
|
63 | 42 | user: test |
|
64 | 43 | date: Thu Jan 1 00:00:00 1970 |
|
65 | 44 | summary: 6 |
|
66 | 45 | |
|
67 | + hg rawcommit -p 6 -d 0 0 -m7 | |
|
68 | + hg manifest 7 | |
|
69 | 46 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
70 | 47 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
71 | + hg parents | |
|
72 | 48 | changeset: 7:3a157da4365d |
|
73 | 49 | tag: tip |
|
74 | 50 | user: test |
|
75 | 51 | date: Thu Jan 1 00:00:00 1970 |
|
76 | 52 | summary: 7 |
|
77 | 53 |
@@ -1,32 +1,21 b'' | |||
|
1 | + hg init | |
|
2 | + hg addremove | |
|
3 | 1 | adding foo |
|
4 | + hg commit -m 1 | |
|
5 | + hg verify | |
|
6 | 2 | checking changesets |
|
7 | 3 | checking manifests |
|
8 | 4 | crosschecking files in changesets and manifests |
|
9 | 5 | checking files |
|
10 | 6 | 1 files, 1 changesets, 1 total revisions |
|
11 | + hg clone . ../branch | |
|
12 | + hg co | |
|
13 | + hg commit -m 2 | |
|
14 | + hg pull ../branch | |
|
15 | 7 | pulling from ../branch |
|
16 | 8 | searching for changes |
|
17 | 9 | adding changesets |
|
18 | 10 | adding manifests |
|
19 | 11 | adding file changes |
|
20 | 12 | added 1 changesets with 1 changes to 1 files |
|
21 | 13 | (run 'hg update' to get a working copy) |
|
22 | + hg verify | |
|
23 | 14 | checking changesets |
|
24 | 15 | checking manifests |
|
25 | 16 | crosschecking files in changesets and manifests |
|
26 | 17 | checking files |
|
27 | 18 | 1 files, 2 changesets, 2 total revisions |
|
28 | + hg co | |
|
29 | 19 | foo |
|
30 | 20 | bar |
|
31 | + hg manifest | |
|
32 | 21 | 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo |
@@ -1,28 +1,21 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m test -d 0 0 | |
|
4 | + hg history | |
|
5 | 1 | changeset: 0:acb14030fe0a |
|
6 | 2 | tag: tip |
|
7 | 3 | user: test |
|
8 | 4 | date: Thu Jan 1 00:00:00 1970 |
|
9 | 5 | summary: test |
|
10 | 6 | |
|
11 | + hg tag -d 0 0 bleah | |
|
12 | + hg history | |
|
13 | 7 | changeset: 1:863197ef0378 |
|
14 | 8 | tag: tip |
|
15 | 9 | user: test |
|
16 | 10 | date: Thu Jan 1 00:00:00 1970 |
|
17 | 11 | summary: Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
18 | 12 | |
|
19 | 13 | changeset: 0:acb14030fe0a |
|
20 | 14 | tag: bleah |
|
21 | 15 | user: test |
|
22 | 16 | date: Thu Jan 1 00:00:00 1970 |
|
23 | 17 | summary: test |
|
24 | 18 | |
|
25 | + hg tag -d 0 0 bleah2 | |
|
26 | 19 | abort: working copy of .hgtags is changed! |
|
27 | 20 | (please commit .hgtags manually) |
|
28 | 21 | failed |
@@ -1,33 +1,33 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | mkdir t |
|
4 | 4 | cd t |
|
5 | 5 | hg init |
|
6 | 6 | hg id |
|
7 | 7 | echo a > a |
|
8 | 8 | hg add a |
|
9 | 9 | hg commit -m "test" -d "0 0" |
|
10 | 10 | hg co |
|
11 | 11 | hg identify |
|
12 |
T=`hg |
|
|
12 | T=`hg tip -v | head -n 1 | cut -d : -f 3` | |
|
13 | 13 | echo "$T first" > .hgtags |
|
14 | 14 | cat .hgtags |
|
15 | 15 | hg add .hgtags |
|
16 | 16 | hg commit -m "add tags" -d "0 0" |
|
17 | 17 | hg tags |
|
18 | 18 | hg identify |
|
19 | 19 | echo bb > a |
|
20 | 20 | hg status |
|
21 | 21 | hg identify |
|
22 | 22 | hg co first |
|
23 | 23 | hg id |
|
24 | 24 | hg -v id |
|
25 | 25 | hg status |
|
26 | 26 | echo 1 > b |
|
27 | 27 | hg add b |
|
28 | 28 | hg commit -m "branch" -d "0 0" |
|
29 | 29 | hg id |
|
30 | 30 | hg co -m 1 |
|
31 | 31 | hg id |
|
32 | 32 | hg status |
|
33 | 33 |
@@ -1,39 +1,15 b'' | |||
|
1 | + hg init | |
|
2 | + hg id | |
|
3 | 1 | unknown |
|
4 | + hg add a | |
|
5 | + hg commit -m test -d 0 0 | |
|
6 | + hg co | |
|
7 | + hg identify | |
|
8 | 2 | acb14030fe0a tip |
|
9 | + hg -q tip | |
|
10 | 3 | acb14030fe0a21b60322c440ad2d20cf7685a376 first |
|
11 | + hg add .hgtags | |
|
12 | + hg commit -m add tags -d 0 0 | |
|
13 | + hg tags | |
|
14 | tip 1:b53d0e1f3043ecbccf1b9ad2cea562c1b50462b2 | |
|
4 | tip 1:b9154636be938d3d431e75a7c906504a079bfe07 | |
|
15 | 5 | first 0:acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
16 | hg -q tip ?:? | |
|
17 | + hg identify | |
|
18 | b53d0e1f3043 tip | |
|
19 | + hg status | |
|
6 | b9154636be93 tip | |
|
20 | 7 | M a |
|
21 | + hg identify | |
|
22 | b53d0e1f3043+ tip | |
|
23 | + hg co first | |
|
24 | + hg id | |
|
8 | b9154636be93+ tip | |
|
25 | 9 | acb14030fe0a+ first |
|
26 | + hg -v id | |
|
27 | 10 | acb14030fe0a21b60322c440ad2d20cf7685a376+ first |
|
28 | + hg status | |
|
29 | 11 | M a |
|
30 | + hg add b | |
|
31 | + hg commit -m branch -d 0 0 | |
|
32 | + hg id | |
|
33 | 12 | c8edf04160c7 tip |
|
34 | + hg co -m 1 | |
|
35 | + hg id | |
|
36 | c8edf04160c7+b53d0e1f3043+ tip | |
|
37 | + hg status | |
|
13 | c8edf04160c7+b9154636be93+ tip | |
|
38 | 14 | M .hgtags |
|
39 | 15 | M a |
@@ -1,28 +1,18 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m test -d 0 0 | |
|
4 | + hg verify | |
|
5 | 1 | checking changesets |
|
6 | 2 | checking manifests |
|
7 | 3 | crosschecking files in changesets and manifests |
|
8 | 4 | checking files |
|
9 | 5 | 1 files, 1 changesets, 1 total revisions |
|
10 | + hg parents | |
|
11 | 6 | changeset: 0:acb14030fe0a |
|
12 | 7 | tag: tip |
|
13 | 8 | user: test |
|
14 | 9 | date: Thu Jan 1 00:00:00 1970 |
|
15 | 10 | summary: test |
|
16 | 11 | |
|
17 | + hg status | |
|
18 | + hg undo | |
|
19 | 12 | rolling back last transaction |
|
20 | + hg verify | |
|
21 | 13 | checking changesets |
|
22 | 14 | checking manifests |
|
23 | 15 | crosschecking files in changesets and manifests |
|
24 | 16 | checking files |
|
25 | 17 | 0 files, 0 changesets, 0 total revisions |
|
26 | + hg parents | |
|
27 | + hg status | |
|
28 | 18 | A a |
@@ -1,27 +1,19 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m a -u a -d 0 0 | |
|
4 | + hg init | |
|
5 | + hg add b | |
|
6 | + hg commit -m b -u b -d 0 0 | |
|
7 | + hg pull ../a | |
|
8 | 1 | pulling from ../a |
|
9 | 2 | searching for changes |
|
10 | 3 | warning: pulling from an unrelated repository! |
|
11 | 4 | adding changesets |
|
12 | 5 | adding manifests |
|
13 | 6 | adding file changes |
|
14 | 7 | added 1 changesets with 1 changes to 1 files |
|
15 | 8 | (run 'hg update' to get a working copy) |
|
16 | + hg heads | |
|
17 | 9 | changeset: 1:9a79c33a9db3 |
|
18 | 10 | tag: tip |
|
19 | 11 | user: a |
|
20 | 12 | date: Thu Jan 1 00:00:00 1970 |
|
21 | 13 | summary: a |
|
22 | 14 | |
|
23 | 15 | changeset: 0:01f8062b2de5 |
|
24 | 16 | user: b |
|
25 | 17 | date: Thu Jan 1 00:00:00 1970 |
|
26 | 18 | summary: b |
|
27 | 19 |
@@ -1,65 +1,50 b'' | |||
|
1 | + hg init | |
|
2 | + hg addremove | |
|
3 | 1 | adding a |
|
4 | + hg commit -m 1 -d 0 0 | |
|
5 | + hg clone . ../r2 | |
|
6 | + hg up | |
|
7 | + hg diff | |
|
8 | 2 | diff -r c19d34741b0a a |
|
9 | 3 | --- a/a |
|
10 | 4 | +++ b/a |
|
11 | 5 | @@ -1,1 +1,1 @@ |
|
12 | 6 | -a |
|
13 | 7 | +abc |
|
14 | + hg addremove | |
|
15 | 8 | adding b |
|
16 | + hg commit -m 2 -d 0 0 | |
|
17 | + hg -q pull ../r1 | |
|
18 | + hg status | |
|
19 | 9 | M a |
|
20 | + hg --debug up | |
|
21 | 10 | resolving manifests |
|
22 | 11 | force None allow None moddirstate True linear True |
|
23 | 12 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
|
24 | 13 | a versions differ, resolve |
|
25 | 14 | remote created b |
|
26 | 15 | getting b |
|
27 | 16 | merging a |
|
28 | 17 | resolving a |
|
29 | 18 | file a: other d730145abbf9 ancestor b789fdd96dc2 |
|
30 | + hg --debug up -m | |
|
31 | 19 | resolving manifests |
|
32 | 20 | force None allow 1 moddirstate True linear True |
|
33 | 21 | ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
|
34 | + hg parents | |
|
35 | 22 | changeset: 1:1e71731e6fbb |
|
36 | 23 | tag: tip |
|
37 | 24 | user: test |
|
38 | 25 | date: Thu Jan 1 00:00:00 1970 |
|
39 | 26 | summary: 2 |
|
40 | 27 | |
|
41 | + hg -v history | |
|
42 | 28 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
43 | 29 | tag: tip |
|
44 | 30 | user: test |
|
45 | 31 | date: Thu Jan 1 00:00:00 1970 |
|
46 | 32 | files: a b |
|
47 | 33 | description: |
|
48 | 34 | 2 |
|
49 | 35 | |
|
50 | 36 | |
|
51 | 37 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
52 | 38 | user: test |
|
53 | 39 | date: Thu Jan 1 00:00:00 1970 |
|
54 | 40 | files: a |
|
55 | 41 | description: |
|
56 | 42 | 1 |
|
57 | 43 | |
|
58 | 44 | |
|
59 | + hg diff | |
|
60 | 45 | diff -r 1e71731e6fbb a |
|
61 | 46 | --- a/a |
|
62 | 47 | +++ b/a |
|
63 | 48 | @@ -1,1 +1,1 @@ |
|
64 | 49 | -a2 |
|
65 | 50 | +abc |
@@ -1,114 +1,87 b'' | |||
|
1 | + hg init | |
|
2 | + hg addremove | |
|
3 | 1 | adding fennel |
|
4 | 2 | adding fenugreek |
|
5 | 3 | adding fiddlehead |
|
6 | 4 | adding glob:glob |
|
7 | 5 | adding beans/black |
|
8 | 6 | adding beans/borlotti |
|
9 | 7 | adding beans/kidney |
|
10 | 8 | adding beans/navy |
|
11 | 9 | adding beans/pinto |
|
12 | 10 | adding beans/turtle |
|
13 | 11 | adding mammals/skunk |
|
14 | 12 | adding mammals/Procyonidae/cacomistle |
|
15 | 13 | adding mammals/Procyonidae/coatimundi |
|
16 | 14 | adding mammals/Procyonidae/raccoon |
|
17 | + hg commit -m commit #0 -d 0 0 | |
|
18 | + hg debugwalk | |
|
19 | 15 | f fennel fennel |
|
20 | 16 | f fenugreek fenugreek |
|
21 | 17 | f fiddlehead fiddlehead |
|
22 | 18 | f glob:glob glob:glob |
|
23 | 19 | f beans/black beans/black |
|
24 | 20 | f beans/borlotti beans/borlotti |
|
25 | 21 | f beans/kidney beans/kidney |
|
26 | 22 | f beans/navy beans/navy |
|
27 | 23 | f beans/pinto beans/pinto |
|
28 | 24 | f beans/turtle beans/turtle |
|
29 | 25 | f mammals/skunk mammals/skunk |
|
30 | 26 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle |
|
31 | 27 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi |
|
32 | 28 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon |
|
33 | + hg debugwalk | |
|
34 | 29 | f mammals/skunk skunk |
|
35 | 30 | f mammals/Procyonidae/cacomistle Procyonidae/cacomistle |
|
36 | 31 | f mammals/Procyonidae/coatimundi Procyonidae/coatimundi |
|
37 | 32 | f mammals/Procyonidae/raccoon Procyonidae/raccoon |
|
38 | + hg debugwalk Procyonidae | |
|
39 | 33 | f mammals/Procyonidae/cacomistle Procyonidae/cacomistle |
|
40 | 34 | f mammals/Procyonidae/coatimundi Procyonidae/coatimundi |
|
41 | 35 | f mammals/Procyonidae/raccoon Procyonidae/raccoon |
|
42 | + hg debugwalk | |
|
43 | 36 | f mammals/Procyonidae/cacomistle cacomistle |
|
44 | 37 | f mammals/Procyonidae/coatimundi coatimundi |
|
45 | 38 | f mammals/Procyonidae/raccoon raccoon |
|
46 | + hg debugwalk .. | |
|
47 | 39 | f mammals/skunk ../skunk |
|
48 | 40 | f mammals/Procyonidae/cacomistle cacomistle |
|
49 | 41 | f mammals/Procyonidae/coatimundi coatimundi |
|
50 | 42 | f mammals/Procyonidae/raccoon raccoon |
|
51 | + hg debugwalk ../beans | |
|
52 | 43 | f beans/black ../beans/black |
|
53 | 44 | f beans/borlotti ../beans/borlotti |
|
54 | 45 | f beans/kidney ../beans/kidney |
|
55 | 46 | f beans/navy ../beans/navy |
|
56 | 47 | f beans/pinto ../beans/pinto |
|
57 | 48 | f beans/turtle ../beans/turtle |
|
58 | + hg debugwalk | |
|
59 | 49 | f mammals/skunk skunk |
|
60 | 50 | f mammals/Procyonidae/cacomistle Procyonidae/cacomistle |
|
61 | 51 | f mammals/Procyonidae/coatimundi Procyonidae/coatimundi |
|
62 | 52 | f mammals/Procyonidae/raccoon Procyonidae/raccoon |
|
63 | + hg debugwalk -Ibeans | |
|
64 | 53 | f beans/black beans/black |
|
65 | 54 | f beans/borlotti beans/borlotti |
|
66 | 55 | f beans/kidney beans/kidney |
|
67 | 56 | f beans/navy beans/navy |
|
68 | 57 | f beans/pinto beans/pinto |
|
69 | 58 | f beans/turtle beans/turtle |
|
70 | + hg debugwalk mammals/../beans/b* | |
|
71 | 59 | f beans/black beans/black |
|
72 | 60 | f beans/borlotti beans/borlotti |
|
73 | + hg debugwalk -X*/Procyonidae mammals | |
|
74 | 61 | f mammals/skunk mammals/skunk |
|
75 | + hg debugwalk path:mammals | |
|
76 | 62 | f mammals/skunk mammals/skunk |
|
77 | 63 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle |
|
78 | 64 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi |
|
79 | 65 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon |
|
80 | + hg debugwalk .. | |
|
81 | 66 | abort: .. not under repository root |
|
82 | + hg debugwalk beans/../.. | |
|
83 | 67 | abort: beans/../.. not under repository root |
|
84 | + hg debugwalk glob:* | |
|
85 | 68 | f fennel fennel |
|
86 | 69 | f fenugreek fenugreek |
|
87 | 70 | f fiddlehead fiddlehead |
|
88 | 71 | f glob:glob glob:glob |
|
89 | + hg debugwalk re:.*[kb]$ | |
|
90 | 72 | f fenugreek fenugreek |
|
91 | 73 | f glob:glob glob:glob |
|
92 | 74 | f beans/black beans/black |
|
93 | 75 | f mammals/skunk mammals/skunk |
|
94 | + hg debugwalk path:beans/black | |
|
95 | 76 | f beans/black beans/black |
|
96 | + hg debugwalk beans beans/* | |
|
97 | 77 | f beans/black beans/black |
|
98 | 78 | f beans/borlotti beans/borlotti |
|
99 | 79 | f beans/kidney beans/kidney |
|
100 | 80 | f beans/navy beans/navy |
|
101 | 81 | f beans/pinto beans/pinto |
|
102 | 82 | f beans/turtle beans/turtle |
|
103 | + hg debugwalk j* | |
|
104 | + hg debugwalk NOEXIST | |
|
105 | 83 | NOEXIST: No such file or directory |
|
106 | + hg debugwalk fifo | |
|
107 | 84 | fifo: unsupported file type (type is fifo) |
|
108 | + hg debugwalk fenugreek | |
|
85 | m fenugreek fenugreek | |
|
109 | 86 | m fenugreek fenugreek |
|
110 | + hg rm fenugreek | |
|
111 | + hg debugwalk fenugreek | |
|
112 | m fenugreek fenugreek | |
|
113 | + hg debugwalk new | |
|
114 | 87 | f new new |
General Comments 0
You need to be logged in to leave comments.
Login now