Mercurial > hg > gitweb
view tests/test-merge5.out @ 665:40fd5722c669
hgeditor: Remove temporary files even if interrupted
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 1292f1fd015767d9682ba2ff5f8377fb6760c3a5
# Parent a4c688c8273e392b1bf33cfc736e00ec752a415e
hgeditor: Remove temporary files even if interrupted
Index: hg/hgeditor
===================================================================
author | Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Sun, 10 Jul 2005 16:00:49 -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