2019-12-10 02:24:31 +03:00
|
|
|
#chg-compatible
|
|
|
|
|
2020-01-20 13:42:49 +03:00
|
|
|
$ disable treemanifest
|
2016-07-12 22:39:34 +03:00
|
|
|
|
2016-02-05 09:47:14 +03:00
|
|
|
Setup
|
|
|
|
|
2020-06-11 03:33:43 +03:00
|
|
|
$ configure mutation-norecord dummyssh
|
2020-01-20 13:42:49 +03:00
|
|
|
$ enable amend pullcreatemarkers pushrebase rebase remotenames
|
|
|
|
$ setconfig ui.username="nobody <no.reply@fb.com>" experimental.rebaseskipobsolete=true
|
|
|
|
$ setconfig remotenames.allownonfastforward=true
|
2016-02-05 09:47:14 +03:00
|
|
|
|
2015-12-10 21:31:47 +03:00
|
|
|
Test that hg pull creates obsolescence markers for landed diffs
|
|
|
|
$ hg init server
|
|
|
|
$ mkcommit() {
|
|
|
|
> echo "$1" > "$1"
|
|
|
|
> hg add "$1"
|
|
|
|
> echo "add $1" > msg
|
|
|
|
> echo "" >> msg
|
phabdiff: make phabdiff more URL-agnostic
Summary: We want out phabricator diff parsers to recognize both https://phabricator.intern.facebook.com/ and https://phabricator.fb.com/ URLs (and a bigger class as well).
Test Plan:
- updated some tests (for `phabdiff` and `pullcreatemarkers` other files don't even seem to be used)
- ran tests
- tested phabdiff manually as well:
{F60696023}
Reviewers: #sourcecontrol, andersonmat, mitrandir, simpkins, lcharignon, quark, ttung, ikostia, rmcelroy
Reviewed By: ikostia, rmcelroy
Subscribers: wez, rmcelroy, net-systems-diffs@, mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D3229776
Tasks: 11013909, 11017978
Signature: t1:3229776:1461839346:08b9b3414e43ff9966bc05591ca5662ef9691aac
2016-04-28 20:55:06 +03:00
|
|
|
> url="https://phabricator.fb.com"
|
|
|
|
> if [ -n "$3" ]; then
|
|
|
|
> url="$3"
|
|
|
|
> fi
|
|
|
|
> [ -z "$2" ] || echo "Differential Revision: $url/D$2" >> msg
|
2015-12-10 21:31:47 +03:00
|
|
|
> hg ci -l msg
|
|
|
|
> }
|
|
|
|
|
|
|
|
Set up server repository
|
|
|
|
|
|
|
|
$ cd server
|
|
|
|
$ mkcommit initial
|
|
|
|
$ mkcommit secondcommit
|
|
|
|
$ hg book master
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
Set up clients repository
|
|
|
|
|
|
|
|
$ hg clone ssh://user@dummy/server client -q
|
|
|
|
$ hg clone ssh://user@dummy/server otherclient -q
|
|
|
|
|
2016-03-22 04:08:04 +03:00
|
|
|
The first client works on several diffs while the second client lands one of her diff
|
2015-12-10 21:31:47 +03:00
|
|
|
|
|
|
|
$ cd otherclient
|
|
|
|
$ mkcommit b
|
|
|
|
$ hg push --to master
|
|
|
|
pushing rev 2e73b79a63d8 to destination ssh://user@dummy/server bookmark master
|
|
|
|
searching for changes
|
2020-02-28 04:51:13 +03:00
|
|
|
updating bookmark master
|
2017-07-24 21:42:24 +03:00
|
|
|
remote: pushing 1 changeset:
|
2015-12-10 21:31:47 +03:00
|
|
|
remote: 2e73b79a63d8 add b
|
2016-01-08 05:30:24 +03:00
|
|
|
$ cd ../client
|
2015-12-10 21:31:47 +03:00
|
|
|
$ mkcommit c 123 # 123 is the phabricator rev number (see function above)
|
phabdiff: make phabdiff more URL-agnostic
Summary: We want out phabricator diff parsers to recognize both https://phabricator.intern.facebook.com/ and https://phabricator.fb.com/ URLs (and a bigger class as well).
Test Plan:
- updated some tests (for `phabdiff` and `pullcreatemarkers` other files don't even seem to be used)
- ran tests
- tested phabdiff manually as well:
{F60696023}
Reviewers: #sourcecontrol, andersonmat, mitrandir, simpkins, lcharignon, quark, ttung, ikostia, rmcelroy
Reviewed By: ikostia, rmcelroy
Subscribers: wez, rmcelroy, net-systems-diffs@, mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D3229776
Tasks: 11013909, 11017978
Signature: t1:3229776:1461839346:08b9b3414e43ff9966bc05591ca5662ef9691aac
2016-04-28 20:55:06 +03:00
|
|
|
$ mkcommit d 124 "https://phabricator.intern.facebook.com"
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
$ mkcommit e 131
|
2015-12-10 21:31:47 +03:00
|
|
|
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}'
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
@ 4 "add e
|
|
|
|
|
|
|
|
|
| Differential Revision: https://phabricator.fb.com/D131"
|
|
|
|
o 3 "add d
|
|
|
|
|
|
phabdiff: make phabdiff more URL-agnostic
Summary: We want out phabricator diff parsers to recognize both https://phabricator.intern.facebook.com/ and https://phabricator.fb.com/ URLs (and a bigger class as well).
Test Plan:
- updated some tests (for `phabdiff` and `pullcreatemarkers` other files don't even seem to be used)
- ran tests
- tested phabdiff manually as well:
{F60696023}
Reviewers: #sourcecontrol, andersonmat, mitrandir, simpkins, lcharignon, quark, ttung, ikostia, rmcelroy
Reviewed By: ikostia, rmcelroy
Subscribers: wez, rmcelroy, net-systems-diffs@, mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D3229776
Tasks: 11013909, 11017978
Signature: t1:3229776:1461839346:08b9b3414e43ff9966bc05591ca5662ef9691aac
2016-04-28 20:55:06 +03:00
|
|
|
| Differential Revision: https://phabricator.intern.facebook.com/D124"
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
o 2 "add c
|
2015-12-10 21:31:47 +03:00
|
|
|
|
|
|
|
|
| Differential Revision: https://phabricator.fb.com/D123"
|
|
|
|
o 1 "add secondcommit" default/master
|
|
|
|
|
|
|
|
|
o 0 "add initial"
|
|
|
|
|
|
|
|
$ hg push --to master
|
phabdiff: make phabdiff more URL-agnostic
Summary: We want out phabricator diff parsers to recognize both https://phabricator.intern.facebook.com/ and https://phabricator.fb.com/ URLs (and a bigger class as well).
Test Plan:
- updated some tests (for `phabdiff` and `pullcreatemarkers` other files don't even seem to be used)
- ran tests
- tested phabdiff manually as well:
{F60696023}
Reviewers: #sourcecontrol, andersonmat, mitrandir, simpkins, lcharignon, quark, ttung, ikostia, rmcelroy
Reviewed By: ikostia, rmcelroy
Subscribers: wez, rmcelroy, net-systems-diffs@, mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D3229776
Tasks: 11013909, 11017978
Signature: t1:3229776:1461839346:08b9b3414e43ff9966bc05591ca5662ef9691aac
2016-04-28 20:55:06 +03:00
|
|
|
pushing rev d5895ab36037 to destination ssh://user@dummy/server bookmark master
|
2015-12-10 21:31:47 +03:00
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
2019-11-07 21:50:10 +03:00
|
|
|
added 4 changesets with 1 changes to 4 files
|
2015-12-10 21:31:47 +03:00
|
|
|
updating bookmark master
|
2020-02-28 04:51:13 +03:00
|
|
|
remote: pushing 3 changesets:
|
|
|
|
remote: 1a07332e9fa1 add c
|
|
|
|
remote: ee96b78ae17d add d
|
|
|
|
remote: d5895ab36037 add e
|
|
|
|
remote: 4 new changesets from the server will be downloaded
|
2017-07-19 17:08:21 +03:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2015-12-10 21:31:47 +03:00
|
|
|
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
Here we strip commits 6, 7, 8 to simulate what happens with landcastle, the
|
|
|
|
push doesn't directly go to the server
|
2015-12-10 21:31:47 +03:00
|
|
|
|
2020-07-07 00:00:16 +03:00
|
|
|
$ hg debugstrip d446b1b2be434509eb0ed51c1da3056d1bc21d12
|
2017-07-19 17:08:21 +03:00
|
|
|
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
|
2015-12-10 21:31:47 +03:00
|
|
|
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
We update to commit 1 to avoid keeping 2, 3, and 4 visible with inhibit
|
2015-12-10 21:31:47 +03:00
|
|
|
|
2020-07-07 00:00:16 +03:00
|
|
|
$ hg update 11b76ecbf1d49ab485207f46d8c45ee8c96b1bfb
|
2017-07-19 17:08:21 +03:00
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2015-12-10 21:31:47 +03:00
|
|
|
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
Here pull should mark 2, 3, and 4 as obsolete since they landed as 6, 7, 8 on
|
|
|
|
the remote
|
2015-12-10 21:31:47 +03:00
|
|
|
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}'
|
|
|
|
@ 1 "add secondcommit"
|
|
|
|
|
|
|
|
|
o 0 "add initial"
|
|
|
|
|
|
|
|
$ hg pull
|
|
|
|
pulling from ssh://user@dummy/server
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
added 3 changesets with 0 changes to 3 files
|
2015-12-10 21:31:47 +03:00
|
|
|
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}'
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
o 8 "add e
|
2015-12-10 21:31:47 +03:00
|
|
|
|
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
| Differential Revision: https://phabricator.fb.com/D131" default/master
|
|
|
|
o 7 "add d
|
|
|
|
|
|
phabdiff: make phabdiff more URL-agnostic
Summary: We want out phabricator diff parsers to recognize both https://phabricator.intern.facebook.com/ and https://phabricator.fb.com/ URLs (and a bigger class as well).
Test Plan:
- updated some tests (for `phabdiff` and `pullcreatemarkers` other files don't even seem to be used)
- ran tests
- tested phabdiff manually as well:
{F60696023}
Reviewers: #sourcecontrol, andersonmat, mitrandir, simpkins, lcharignon, quark, ttung, ikostia, rmcelroy
Reviewed By: ikostia, rmcelroy
Subscribers: wez, rmcelroy, net-systems-diffs@, mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D3229776
Tasks: 11013909, 11017978
Signature: t1:3229776:1461839346:08b9b3414e43ff9966bc05591ca5662ef9691aac
2016-04-28 20:55:06 +03:00
|
|
|
| Differential Revision: https://phabricator.intern.facebook.com/D124"
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
o 6 "add c
|
|
|
|
|
|
|
|
|
| Differential Revision: https://phabricator.fb.com/D123"
|
|
|
|
o 5 "add b"
|
2015-12-10 21:31:47 +03:00
|
|
|
|
|
|
|
|
@ 1 "add secondcommit"
|
|
|
|
|
|
|
|
|
o 0 "add initial"
|
|
|
|
|
2016-01-08 05:30:24 +03:00
|
|
|
Rebasing a stack containing landed changesets should only rebase the non-landed
|
2015-12-10 21:31:47 +03:00
|
|
|
changesets
|
|
|
|
|
2020-07-07 00:00:16 +03:00
|
|
|
$ hg up --hidden d5895ab3603770985bf7ab04bf25c0da2d7e08ab # --hidden because directaccess works only with hashes
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2019-04-11 17:45:41 +03:00
|
|
|
$ mkcommit k 202
|
[pullcreatemarkers] fix issues creating obsolescence markers
Summary:
Use a transaction, to make sure commits get hidden properly. Currently it
fails to hide all commits if multiple commits on the same branch are all
obsoleted in the same pull. When creating obsolescence markers for some of the
earlier commits, it thinks they still have non-hidden successors, and doesn't
know that these successors are also going to be hidden by the same pull
operation.
Also avoid walking all draft commits if nothing new was landed in this pull.
Test Plan:
Updated the tests to exercise the case where a pull obsoletes multiple commits
all at the tip of a branch.
Reviewers: #sourcecontrol, lcharignon, ikostia, durham, ttung
Reviewed By: durham
Subscribers: durham, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.fb.com/D3013783
Signature: t1:3013783:1457136740:cbcd0220e82d044d25a34692793e70f5be61d63e
2016-03-05 03:28:58 +03:00
|
|
|
$ hg rebase -d default/master
|
2019-10-16 02:28:01 +03:00
|
|
|
note: not rebasing 1a07332e9fa1 "add c", already in destination as d446b1b2be43 "add c"
|
|
|
|
note: not rebasing ee96b78ae17d "add d", already in destination as 1f539cc6f364 "add d"
|
|
|
|
note: not rebasing d5895ab36037 "add e", already in destination as 461a5b25b3dc "add e" (default/master master)
|
2019-12-18 00:45:17 +03:00
|
|
|
rebasing 7dcd118e395a "add k"
|
2015-12-10 21:31:47 +03:00
|
|
|
|
2019-04-11 17:45:41 +03:00
|
|
|
$ echo more >> k
|
|
|
|
$ hg amend
|
2020-07-07 00:00:16 +03:00
|
|
|
$ hg unhide c34ae580ee12e8c648afba30a093690a6e018dac
|
2019-04-11 17:45:41 +03:00
|
|
|
|
|
|
|
$ cd ../server
|
|
|
|
$ mkcommit k 202
|
|
|
|
$ cd ../client
|
|
|
|
$ hg pull
|
|
|
|
pulling from ssh://user@dummy/server
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
2019-11-07 21:50:10 +03:00
|
|
|
added 1 changesets with 0 changes to 1 files
|
2019-04-11 17:45:41 +03:00
|
|
|
|
2019-04-11 17:45:41 +03:00
|
|
|
(Note: pullcreatemarkers created two markers, however only one of them was
|
|
|
|
counted in the message as the first commit had previously been obsoleted
|
|
|
|
and revived)
|