This is the mail archive of the
mailing list for the GDB project.
Re: GIT and CVS
On 14 Oct 2011, at 17:04, Eli Zaretskii wrote:
> From: Phil Muldoon <firstname.lastname@example.org>
> Cc: email@example.com, firstname.lastname@example.org
> Date: Fri, 14 Oct 2011 15:51:40 +0100
>> git pull will fetch and merge changes.
> Then why does the man page says it's "discouraged"?
> Warning: Running git pull (actually, the underlying git merge) with
> uncommitted changes is discouraged: while possible, it leaves you in a
> state that is hard to back out of in the case of a conflict.
> That sounds like "don't do it".
What they describe is the same behaviour you get when doing a cvs update on a dirty tree: in case there are conflicts, you don't have a copy anymore of your original patch against the version to which it cleanly applied. They discourage that because that can be annoying. In case of a git stash or branch (which in case of cvs would correspond to something like "cvs diff > preupdate.patch", optionally with a record of the current revisions of all files involved), you keep a clean copy of your patch in its original version for comparison purposes afterwards.