Re: Letters at beginnings of columns of svn output

2011-01-20 Thread Stefan Sperling
On Thu, Jan 20, 2011 at 09:22:43AM -0800, JamieEchlin wrote: > > > > Stefan Sperling-7 wrote: > > > > > > This cannot happen during merge though, so the help text for merge > > shouldn't be listing it. > > > > It happens all the time?! You merge changelists that contain added files, > howeve

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread Stefan Sperling
On Thu, Jan 20, 2011 at 06:56:21PM +0200, Daniel Shahaf wrote: > Stefan Sperling wrote on Thu, Jan 20, 2011 at 16:24:21 +0100: > > On Thu, Jan 20, 2011 at 03:09:57PM +0100, Ulrich Eckhardt wrote: > > > What is "Existed"? > > > > $ svn up > > svn: Failed to add directory 'foo': an unversioned direc

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread JamieEchlin
Stefan Sperling-7 wrote: > > > This cannot happen during merge though, so the help text for merge > shouldn't be listing it. > It happens all the time?! You merge changelists that contain added files, however the file can't be added because an unversioned file with the same path already exis

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread Daniel Shahaf
Stefan Sperling wrote on Thu, Jan 20, 2011 at 16:24:21 +0100: > On Thu, Jan 20, 2011 at 03:09:57PM +0100, Ulrich Eckhardt wrote: > > What is "Existed"? > > $ svn up > svn: Failed to add directory 'foo': an unversioned directory of the same name > already exists > $ svn up --force > Efoo > Upd

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread JamieEchlin
> What is "Existed"? Christian Unger-7 wrote: > > > it's gone now :-) > Hrm, I was hoping that it meant Existed as in existed before the merge was started, and thus corresponds to a "skipped" file. So that users could see that files had been "skipped" if they had missed it in the merge outpu

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread Stefan Sperling
On Thu, Jan 20, 2011 at 03:09:57PM +0100, Ulrich Eckhardt wrote: > > For each merged item a line will be printed with characters reporting > > the action taken. These characters have the following meaning: > > > > A Added > > D Deleted > > U Updated > > C Conflict > > G

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread Christian Unger
it's gone now :-) On 20.01.2011, at 15:09, Ulrich Eckhardt wrote: >> For each merged item a line will be printed with characters reporting >> the action taken. These characters have the following meaning: >> >>A Added >>D Deleted >>U Updated >>C Conflict >>G Merged >

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread Ulrich Eckhardt
> For each merged item a line will be printed with characters reporting > the action taken. These characters have the following meaning: > > A Added > D Deleted > U Updated > C Conflict > G Merged > E Existed > R Replaced What is "Existed"? Uli -- ML: ht

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread Mark Phippard
See this blog post: http://blogs.collab.net/subversion/2010/11/resolving-tree-conflicts On Thu, Jan 20, 2011 at 8:38 AM, Steve Cohen wrote: > On 01/20/2011 05:19 AM, Stephen Butler wrote: > >>   A 'C' in the third column indicates a tree conflict, while a 'C' in > > Thanks, Stephen. > > While

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread Steve Cohen
On 01/20/2011 05:19 AM, Stephen Butler wrote: A 'C' in the third column indicates a tree conflict, while a 'C' in Thanks, Stephen. While we're on the subject, can you tell me succinctly what is the exact definition of a "tree conflict"? This used to drive me nuts when I used the subclip

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread Stephen Butler
On Jan 20, 2011, at 12:01 , Steve Cohen wrote: > On 01/20/2011 04:28 AM, JamieEchlin wrote: >> >> >> Stephen Butler wrote: >>> >>> On the command line, try >>> >>>svn help update >>> >>> (for instance). >>> >>> It's also in the SVN Book's command reference chapter, under >>> the given '

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread JamieEchlin
G means merGed by the way, however it would be good to see docn for the letters for tree and property conflicts and everything else. -- View this message in context: http://old.nabble.com/Letters-at-beginnings-of-columns-of-svn-output-tp30714345p30718182.html Sent from the Subversion Users mail

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread Steve Cohen
On 01/20/2011 04:28 AM, JamieEchlin wrote: Stephen Butler wrote: On the command line, try svn help update (for instance). It's also in the SVN Book's command reference chapter, under the given 'svn' subcommand: There is docn for the letters for status and for update, but I haven't f

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread JamieEchlin
Stephen Butler wrote: > > On the command line, try > >svn help update > > (for instance). > > It's also in the SVN Book's command reference chapter, under > the given 'svn' subcommand: > There is docn for the letters for status and for update, but I haven't found anything for the output

Re: Letters at beginnings of columns of svn output

2011-01-19 Thread Stephen Butler
On Jan 19, 2011, at 23:04 , Steve Cohen wrote: > Where is this documented? I sometimes see letters I don't know, such as "G", > what is that for - and these outputs may differ from command to command. > Also the column in which a letter appears is significant. > > Can someone please point me