Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 645:a55048b2ae3a
this patch permits hgweb to show the deleted files in the changeset diff
# HG changeset patch
# User kreijack@inwind.REMOVEME.it
# Node ID 08b33970007e753f12b2b2f9d0e169981a6e8c3c
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
this patch permits hgweb to show the deleted files in the changeset diff
author | kreijack@inwind.REMOVEME.it |
---|---|
date | Wed, 06 Jul 2005 22:28:50 -0800 |
parents | d45d1c90032e |
children | 7e4843b7efd2 |
line wrap: on
line source
+ mkdir t + cd t + hg init + echo This is file a1 + echo This is file b1 + hg add a b + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b22 + hg commit '-tcomment #1' -d '0 0' -u user + hg update 0 + rm b + hg commit -A '-tcomment #2' -d '0 0' -u user + yes k + hg update 1 this update spans a branch affecting the following files: b aborting update spanning branches! (use update -m to perform a branch merge) + exit 0