Re: Merge 'G' -- what the h* is it?

Karl,

Thank you. I did check "svn help status" for description of the letter,
but did not try update (comes from a long history of not using CLI client,
so I do not know where to look for a specific help text). Also, I DID go
to svnbook.red-bean.com, but again was searching for information on
merging, not updating. As you already noticed, svn is a bit
help-challenged in certain areas :)

Br,

---
  Miha Vitorovic
  Inženir v tehničnem področju
  Customer Support Engineer
   NIL Data Communications,  Tivolska cesta 48,  1000 Ljubljana,  Slovenia
   Phone +386 1 4746 500      Fax +386 1 4746 501     http://www.NIL.si
Karl Fogel <kfogel_at_red-bean.com> 
23.06.2008 17:28
Please respond to
Karl Fogel <kfogel_at_red-bean.com>
To
Miha Vitorovic <mvitorovic_at_nil.si>
cc
users_at_subversion.tigris.org
Subject
Re: Merge 'G' -- what the h* is it?
Miha Vitorovic <mvitorovic_at_nil.si> writes:
> I'm having some fun with merging (the old style), and the dry run tells 
> me:
>
>  G   wk/images
>
> Searching the help did not reveal me what 'G' stands for? Can someone 
> enlighten me (and maybe put this into the help text).
>
> Thanks in advance and best regards,
merGed -- meaning that there were local modifications in the file *and*
new changes brought in via the merge (or update), but the two did not
conflict (otherwise you would have seen "C").
See:
   svn help update
   svnbook.red-bean.com
It would be nice if 'svn merge' pointed the user to the help for update,
since they use the same status letters.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org