mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
9efc7f05e3
Upon pull or unbundle, we display a message with the range of new revisions fetched. This revision range could readily be used after a pull to look out what's new with 'hg log'. The algorithm takes care of filtering "obsolete" revisions that might be present in transaction's "changes" but should not be displayed to the end user.
54 lines
1.2 KiB
Perl
54 lines
1.2 KiB
Perl
Corrupt an hg repo with a pull started during an aborted commit
|
|
Create two repos, so that one of them can pull from the other one.
|
|
|
|
$ hg init source
|
|
$ cd source
|
|
$ touch foo
|
|
$ hg add foo
|
|
$ hg ci -m 'add foo'
|
|
$ hg clone . ../corrupted
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo >> foo
|
|
$ hg ci -m 'change foo'
|
|
|
|
Add a hook to wait 5 seconds and then abort the commit
|
|
|
|
$ cd ../corrupted
|
|
$ echo "[hooks]" >> .hg/hgrc
|
|
$ echo 'pretxncommit = sh -c "sleep 5; exit 1"' >> .hg/hgrc
|
|
|
|
start a commit...
|
|
|
|
$ touch bar
|
|
$ hg add bar
|
|
$ hg ci -m 'add bar' &
|
|
|
|
... and start a pull while the commit is still running
|
|
|
|
$ sleep 1
|
|
$ hg pull ../source 2>/dev/null
|
|
pulling from ../source
|
|
transaction abort!
|
|
rollback completed
|
|
abort: pretxncommit hook exited with status 1
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets 52998019f625
|
|
(run 'hg update' to get a working copy)
|
|
|
|
see what happened
|
|
|
|
$ wait
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 2 changesets, 2 total revisions
|
|
|
|
$ cd ..
|