|
|
Created on 2005-10-24.23:59:17 by jsgf, last changed 2007-07-10.00:15:32 by mpm.
|
| msg3477 (view) |
Author: mpm |
Date: 2007-07-10.00:15:32 |
|
Nicely? I think the user should be given a stern lecture.
Moving back from in-progress to chatting. I was expecting a fix for this to fall
out of the rename work, but it didn't.
|
| msg3476 (view) |
Author: jsipek |
Date: 2007-07-10.00:11:26 |
|
What are even the semantics of such operation? I guess aborting _nicely_ is good
enough, no?
|
| msg2465 (view) |
Author: tonfa |
Date: 2006-11-28.17:46:23 |
|
still relevant
hg init a
hg clone a b
cd a
mkdir dir
touch dir/a
hg ci -Am m
cd ../b
touch dir
hg ci -Am m
hg pull ../a
hg merge
cd ../a
hg pull ../b
hg merge
|
| msg42 (view) |
Author: jsgf |
Date: 2005-10-24.23:59:17 |
|
If you're merging with 'update -m' and you get a conflict between a file and a
directory, you get one of two unhelpful responses:
$ hg update -m
abort: Is a directory
$ hg update -m
abort: File exists: /home/jeremy/hg/t/1/foo
|
|
| Date |
User |
Action |
Args |
| 2007-07-10 00:15:32 | mpm | set | status: in-progress -> chatting
nosy:
mpm, ThomasAH, tonfa, jsgf, jsipek, junkblocker
messages:
+ msg3477 |
| 2007-07-10 00:11:27 | jsipek | set | nosy:
mpm, ThomasAH, tonfa, jsgf, jsipek, junkblocker
messages:
+ msg3476 |
| 2007-06-23 19:47:11 | mpm | set | nosy:
+ mpm
assignedto: jsipek -> mpm |
| 2006-11-28 17:46:24 | tonfa | set | nosy:
ThomasAH, tonfa, jsgf, jsipek, junkblocker
messages:
+ msg2465 |
| 2006-04-15 17:31:41 | junkblocker | set | nosy:
+ junkblocker |
| 2006-01-24 19:19:55 | tonfa | set | nosy:
+ tonfa |
| 2006-01-23 21:52:26 | ThomasAH | set | nosy:
+ ThomasAH |
| 2006-01-23 06:36:14 | jsipek | set | status: unread -> in-progress
assignedto: jsipek
nosy:
+ jsipek |
| 2005-10-24 23:59:17 | jsgf | create | |
|