Mercurial > hg
view tests/test-clone-failure.t @ 13155:f02d7a562a21
subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)
This patch avoids empty commit when .hgsubstate is dirty. Empty commit
was caused by .hgsubstate being updated back to the state of the
working copy parent when committing, if a user had changed it manually
and not made any changes in subrepositories.
The subrepository state from the working copies parent is compared
with the state calculated as a result of trying to commit the
subrepositories. If the two states are the same, then return None
otherwise the commit is just done.
The line: "committing subrepository x" will be written if there is
nothing committed, but .hgsubstate is dirty for x subrepository.
author | Erik Zielke <ez@aragost.com> |
---|---|
date | Mon, 29 Nov 2010 09:37:23 +0100 |
parents | bdb73eede5fb |
children | ffb5c09ba822 |
line wrap: on
line source
No local source $ hg clone a b abort: repository a not found! [255] No remote source $ hg clone http://127.0.0.1:3121/a b abort: error: Connection refused [255] $ rm -rf b # work around bug with http clone Inaccessible source $ mkdir a $ chmod 000 a $ hg clone a b abort: repository a not found! [255] Inaccessible destination $ mkdir b $ cd b $ hg init $ hg clone . ../a abort: Permission denied: ../a [255] $ cd .. $ chmod 700 a $ rm -r a b Source of wrong type $ if "$TESTDIR/hghave" -q fifo; then > mkfifo a > hg clone a b > rm a > else > echo "abort: repository a not found!" > fi abort: repository a not found! Default destination, same directory $ mkdir q $ cd q $ hg init $ cd .. $ hg clone q destination directory: q abort: destination 'q' is not empty [255] destination directory not empty $ mkdir a $ echo stuff > a/a $ hg clone q a abort: destination 'a' is not empty [255] leave existing directory in place after clone failure $ hg init c $ cd c $ echo c > c $ hg commit -A -m test adding c $ chmod -rx .hg/store/data $ cd .. $ mkdir d $ hg clone c d 2> err [255] $ test -d d $ test -d d/.hg [1] reenable perm to allow deletion $ chmod +rx c/.hg/store/data