[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] What are rosters?
From: |
William Uther |
Subject: |
Re: [Monotone-devel] What are rosters? |
Date: |
Wed, 22 Aug 2007 15:32:55 +1000 |
On 22/08/2007, at 2:40 PM, Brian May wrote:
"William" == William Uther
<address@hidden> writes:
William> If we just do what I said above, then we'd lose
history. We'd also
William> need to make sure that the revision we resurrect the
node from is a
William> parent of the new revision generated. This might be
best done by
William> cloning merge_into_dir quite closely, and so the
resurrect command
William> would actually commit its own revision rather than
being a workspace
William> command. This is probably ok as you can use revert to
get back a
William> file that you've deleted but not committed yet.
Would this still work even if the undeleted file is deleted again?
The goal is for monotone to treat the existence of the file the same
way it treats renames.
Make a file called "exists". In your example, rename it to
"notExists" to "delete" it. Rename it back to "exists" to "undelete"
it. See what happens when you merge.
This may help: http://revctrl.org/MarkMerge
or this: http://monotone.ca/docs/Mark_002dMerge.html
Be well,
Will :-}
- [Monotone-devel] What are rosters?, William Uther, 2007/08/17
- Re: [Monotone-devel] What are rosters?, Nathaniel Smith, 2007/08/17
- Re: [Monotone-devel] What are rosters?, William Uther, 2007/08/17
- Re: [Monotone-devel] What are rosters?, Brian May, 2007/08/20
- Re: [Monotone-devel] What are rosters?, William Uther, 2007/08/20
- Re: [Monotone-devel] What are rosters?, Brian May, 2007/08/20
- Re: [Monotone-devel] What are rosters?, William Uther, 2007/08/20
- Re: [Monotone-devel] What are rosters?, Brian May, 2007/08/22
- Re: [Monotone-devel] What are rosters?,
William Uther <=
- Re: [Monotone-devel] What are rosters?, Brian May, 2007/08/22
- Re: [Monotone-devel] What are rosters?, Nathaniel Smith, 2007/08/23