[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Re: Dumb Question
From: |
Steven E. Harris |
Subject: |
[Monotone-devel] Re: Dumb Question |
Date: |
Thu, 13 Jul 2006 11:03:52 -0700 |
User-agent: |
Gnus/5.110006 (No Gnus v0.6) XEmacs/21.4.13 (cygwin32) |
Nathaniel Smith <address@hidden> writes:
> Other VCSes have historically overloaded the 'update' command, so it
> performed a bunch of logically unrelated functions -- moving your
> work in progress, doing merges, reverting files, you name it.
Does "mtn update" merge changes into files modified within the
workspace? The usage string says
,----
| This command modifies your workspace to be based off of a different
| revision, preserving uncommitted changes as it does so.
`----
Does "preserving [an] uncommitted change" mean that it doesn't touch
any file that's been modified, even if file in question has been
changed in the repository since the pre-"update" revision? If not, how
does one force the merge? Perhaps this is the pined-for
merge-in-workspace feature I'm thinking of.
--
Steven E. Harris
- Re: [Monotone-devel] Triggers (was: Re: FAQ on wiki), (continued)
- [Monotone-devel] Re: Triggers, Koen Kooi, 2006/07/13
- Re: [Monotone-devel] Re: Triggers, Nathaniel Smith, 2006/07/13
- Re: [Monotone-devel] Re: Triggers, Alex Queiroz, 2006/07/13
- Re: [Monotone-devel] Re: FAQ on wiki, Richard Levitte - VMS Whacker, 2006/07/13
- Re: [Monotone-devel] Re: FAQ on wiki, Matthew A. Nicholson, 2006/07/13
- Re: [Monotone-devel] Re: FAQ on wiki, Richard Levitte - VMS Whacker, 2006/07/13
- Re: [Monotone-devel] Re: FAQ on wiki, Matthew A. Nicholson, 2006/07/13
- Re: [Monotone-devel] Re: Dumb Question, Nathaniel Smith, 2006/07/12
- [Monotone-devel] Re: Dumb Question,
Steven E. Harris <=
- Re: [Monotone-devel] Re: Dumb Question, Timothy Brownawell, 2006/07/13
- [Monotone-devel] Re: Dumb Question, Steven E. Harris, 2006/07/13
- Re: [Monotone-devel] Re: Dumb Question, Nathaniel Smith, 2006/07/13