| author | Yuya Nishihara <yuya@tcha.org> |
| Sat, 24 Mar 2018 15:10:51 +0900 | |
| changeset 37120 | a8a902d7176e |
| parent 30238 | 9843e3d9f4b6 |
| child 37383 | cb70be32f5f7 |
| permissions | -rw-r--r-- |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
1 |
Journal extension test: tests the share extension support |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
2 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
3 |
$ cat >> testmocks.py << EOF |
|
37120
a8a902d7176e
procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
30238
diff
changeset
|
4 |
> # mock out procutil.getuser() and util.makedate() to supply testable values |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
5 |
> import os |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
6 |
> from mercurial import util |
|
37120
a8a902d7176e
procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
30238
diff
changeset
|
7 |
> from mercurial.utils import procutil |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
8 |
> def mockgetuser(): |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
9 |
> return 'foobar' |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
10 |
> |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
11 |
> def mockmakedate(): |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
12 |
> filename = os.path.join(os.environ['TESTTMP'], 'testtime') |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
13 |
> try: |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
14 |
> with open(filename, 'rb') as timef: |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
15 |
> time = float(timef.read()) + 1 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
16 |
> except IOError: |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
17 |
> time = 0.0 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
18 |
> with open(filename, 'wb') as timef: |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
19 |
> timef.write(str(time)) |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
20 |
> return (time, 0) |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
21 |
> |
|
37120
a8a902d7176e
procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
30238
diff
changeset
|
22 |
> procutil.getuser = mockgetuser |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
23 |
> util.makedate = mockmakedate |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
24 |
> EOF |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
25 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
26 |
$ cat >> $HGRCPATH << EOF |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
27 |
> [extensions] |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
28 |
> journal= |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
29 |
> share= |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
30 |
> testmocks=`pwd`/testmocks.py |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
31 |
> [remotenames] |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
32 |
> rename.default=remote |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
33 |
> EOF |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
34 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
35 |
$ hg init repo |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
36 |
$ cd repo |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
37 |
$ hg bookmark bm |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
38 |
$ touch file0 |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
39 |
$ hg commit -Am file0-added |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
40 |
adding file0 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
41 |
$ hg journal --all |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
42 |
previous locations of the working copy and bookmarks: |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
43 |
0fd3805711f9 . commit -Am file0-added |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
44 |
0fd3805711f9 bm commit -Am file0-added |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
45 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
46 |
A shared working copy initially receives the same bookmarks and working copy |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
47 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
48 |
$ cd .. |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
49 |
$ hg share repo shared1 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
50 |
updating working directory |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
51 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
52 |
$ cd shared1 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
53 |
$ hg journal --all |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
54 |
previous locations of the working copy and bookmarks: |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
55 |
0fd3805711f9 . share repo shared1 |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
56 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
57 |
unless you explicitly share bookmarks |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
58 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
59 |
$ cd .. |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
60 |
$ hg share --bookmarks repo shared2 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
61 |
updating working directory |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
62 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
63 |
$ cd shared2 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
64 |
$ hg journal --all |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
65 |
previous locations of the working copy and bookmarks: |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
66 |
0fd3805711f9 . share --bookmarks repo shared2 |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
67 |
0fd3805711f9 bm commit -Am file0-added |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
68 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
69 |
Moving the bookmark in the original repository is only shown in the repository |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
70 |
that shares bookmarks |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
71 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
72 |
$ cd ../repo |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
73 |
$ touch file1 |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
74 |
$ hg commit -Am file1-added |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
75 |
adding file1 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
76 |
$ cd ../shared1 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
77 |
$ hg journal --all |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
78 |
previous locations of the working copy and bookmarks: |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
79 |
0fd3805711f9 . share repo shared1 |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
80 |
$ cd ../shared2 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
81 |
$ hg journal --all |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
82 |
previous locations of the working copy and bookmarks: |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
83 |
4f354088b094 bm commit -Am file1-added |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
84 |
0fd3805711f9 . share --bookmarks repo shared2 |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
85 |
0fd3805711f9 bm commit -Am file0-added |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
86 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
87 |
But working copy changes are always 'local' |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
88 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
89 |
$ cd ../repo |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
90 |
$ hg up 0 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
91 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
92 |
(leaving bookmark bm) |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
93 |
$ hg journal --all |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
94 |
previous locations of the working copy and bookmarks: |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
95 |
0fd3805711f9 . up 0 |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
96 |
4f354088b094 . commit -Am file1-added |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
97 |
4f354088b094 bm commit -Am file1-added |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
98 |
0fd3805711f9 . commit -Am file0-added |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
99 |
0fd3805711f9 bm commit -Am file0-added |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
100 |
$ cd ../shared2 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
101 |
$ hg journal --all |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
102 |
previous locations of the working copy and bookmarks: |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
103 |
4f354088b094 bm commit -Am file1-added |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
104 |
0fd3805711f9 . share --bookmarks repo shared2 |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
105 |
0fd3805711f9 bm commit -Am file0-added |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
106 |
$ hg up tip |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
107 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
108 |
$ hg up 0 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
109 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
110 |
$ hg journal |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
111 |
previous locations of '.': |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
112 |
0fd3805711f9 up 0 |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
113 |
4f354088b094 up tip |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
114 |
0fd3805711f9 share --bookmarks repo shared2 |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
115 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
116 |
Unsharing works as expected; the journal remains consistent |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
117 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
118 |
$ cd ../shared1 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
119 |
$ hg unshare |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
120 |
$ hg journal --all |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
121 |
previous locations of the working copy and bookmarks: |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
122 |
0fd3805711f9 . share repo shared1 |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
123 |
$ cd ../shared2 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
124 |
$ hg unshare |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
125 |
$ hg journal --all |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
126 |
previous locations of the working copy and bookmarks: |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
127 |
0fd3805711f9 . up 0 |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
128 |
4f354088b094 . up tip |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
129 |
4f354088b094 bm commit -Am file1-added |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
130 |
0fd3805711f9 . share --bookmarks repo shared2 |
|
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
131 |
0fd3805711f9 bm commit -Am file0-added |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
132 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
133 |
New journal entries in the source repo no longer show up in the other working copies |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
134 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
135 |
$ cd ../repo |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
136 |
$ hg bookmark newbm -r tip |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
137 |
$ hg journal newbm |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
138 |
previous locations of 'newbm': |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
139 |
4f354088b094 bookmark newbm -r tip |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
140 |
$ cd ../shared2 |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
141 |
$ hg journal newbm |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
142 |
previous locations of 'newbm': |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
143 |
no recorded locations |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
144 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
145 |
This applies for both directions |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
146 |
|
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
147 |
$ hg bookmark shared2bm -r tip |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
148 |
$ hg journal shared2bm |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
149 |
previous locations of 'shared2bm': |
|
30238
9843e3d9f4b6
tests: avoid quoting of commit messages for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29503
diff
changeset
|
150 |
4f354088b094 bookmark shared2bm -r tip |
|
29503
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
151 |
$ cd ../repo |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
152 |
$ hg journal shared2bm |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
153 |
previous locations of 'shared2bm': |
|
0103b673d6ca
journal: add share extension support
Martijn Pieters <mjpieters@fb.com>
parents:
diff
changeset
|
154 |
no recorded locations |