You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Steve Cohen <sc...@javactivity.org> on 2011/01/19 23:04:28 UTC
Letters at beginnings of columns of svn output
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 to a document where this is explained? It's
not in the manual except for the status command.
Thanks
Re: Letters at beginnings of columns of svn output
Posted by JamieEchlin <ja...@credit-suisse.com>.
> 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 output.
Don't want to keep banging on about this but this should be treated as a
serious error.
cheers, jamie
--
View this message in context: http://old.nabble.com/Letters-at-beginnings-of-columns-of-svn-output-tp30714345p30720131.html
Sent from the Subversion Users mailing list archive at Nabble.com.
Re: Letters at beginnings of columns of svn output
Posted by Christian Unger <ch...@me.com>.
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
>> E Existed
>> R Replaced
>
>
> What is "Existed"?
>
> Uli
>
>
> --
> ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html
> FAQ: http://subversion.apache.org/faq.html
> Docs: http://svnbook.red-bean.com/
>
>
> **************************************************************************************
> Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
> Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
> **************************************************************************************
> Visit our website at <http://www.dominolaser.com/>
> **************************************************************************************
> Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
> E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht verantwortlich.
> **************************************************************************************
>
>
--
christian unger • pferdeweide 47 • 22589 hamburg, germany
-------------------------------------------------------------------------------
fon +49 16090987304
fon +49 4097073763 • fax +49 4097073765
--------------------------------------------------------------------
aim christian_unger@mac.com
skype c_unger
Re: Letters at beginnings of columns of svn output
Posted by Stefan Sperling <st...@elego.de>.
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 directory of the same name already exists
> > $ svn up --force
> > E foo
> > Updated to revision 3.
> > $
> >
> > This cannot happen during merge though, so the help text for merge
> > shouldn't be listing it.
> >
>
> What if a merge adds a file?
>
> % svn cp ^/A ^/A2 -mm
> % svn mkdir ^/A2/B2 -mm
> % svn co ^/A ./
> % mkdir B2
> % svn merge ^/A2
>
> (untested)
The only paths in the code where the corresponding notification
(svn_wc_notify_exists) is issued are in libsvn_wc/update_editor.c.
Re: Letters at beginnings of columns of svn output
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
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
> E foo
> Updated to revision 3.
> $
>
> This cannot happen during merge though, so the help text for merge
> shouldn't be listing it.
>
What if a merge adds a file?
% svn cp ^/A ^/A2 -mm
% svn mkdir ^/A2/B2 -mm
% svn co ^/A ./
% mkdir B2
% svn merge ^/A2
(untested)
Re: Letters at beginnings of columns of svn output
Posted by Stefan Sperling <st...@elego.de>.
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,
> however the file can't be added because an unversioned file with the same
> path already exists in the wc. Svn client says "skipped foo.c".
>
> It would be nice if svn status marked that, perhaps with Existed.
>
> It's easy to do too... merge, revert -R, then merge again. ie what I was
> banging about in paras 6 onwards here:
> http://svn.haxx.se/users/archive-2011-01/0104.shtml.
Sorry, I could have been clearer.
What I meant to say was that the E notification cannot happen during merge,
because the merge code doesn't use this notification type.
Stefan
Re: Letters at beginnings of columns of svn output
Posted by JamieEchlin <ja...@credit-suisse.com>.
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 exists in the wc. Svn client says "skipped foo.c".
It would be nice if svn status marked that, perhaps with Existed.
It's easy to do too... merge, revert -R, then merge again. ie what I was
banging about in paras 6 onwards here:
http://svn.haxx.se/users/archive-2011-01/0104.shtml.
--
View this message in context: http://old.nabble.com/Letters-at-beginnings-of-columns-of-svn-output-tp30714345p30721385.html
Sent from the Subversion Users mailing list archive at Nabble.com.
Re: Letters at beginnings of columns of svn output
Posted by Stefan Sperling <st...@elego.de>.
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 Merged
> > E Existed
> > R Replaced
>
>
> What is "Existed"?
$ svn up
svn: Failed to add directory 'foo': an unversioned directory of the same name already exists
$ svn up --force
E foo
Updated to revision 3.
$
This cannot happen during merge though, so the help text for merge
shouldn't be listing it.
Stefan
Re: Letters at beginnings of columns of svn output
Posted by Ulrich Eckhardt <ul...@dominolaser.com>.
> 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: http://subversion.apache.org/docs/community-guide/mailing-lists.html
FAQ: http://subversion.apache.org/faq.html
Docs: http://svnbook.red-bean.com/
**************************************************************************************
Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at <http://www.dominolaser.com/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
Re: Letters at beginnings of columns of svn output
Posted by JamieEchlin <ja...@credit-suisse.com>.
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 mailing list archive at Nabble.com.
Re: Letters at beginnings of columns of svn output
Posted by Mark Phippard <ma...@gmail.com>.
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 <sc...@javactivity.org> 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 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
> subclipse plugin. I got these all the time and I could never understand
> them. I've now switched to the subversive Eclipse plugin which is even
> worse for merging (I've never been able replicate with it merges that are
> simple on the command line) but better in other respects, and have fallen
> back on a strategy of doing all merges on the command line which seems to
> produce better results for the most part.
>
> Both plugins assume a great deal of knowledge about the merge process and
> their "documentation" is restricted to inadequate explanations of what each
> widget in the plugin does, without explaining in real-world terms i.e. in
> use cases: When you have scenario x you want to do y, etc.
>
> The command line is better documented but even here as we see, there are
> holes.
>
> This question was sparked by the following scenario:
>
> I had made a relatively small number of changes in a branch for future
> development. Among these changes were the additions of several new source
> files. As I was doing so, a higher-priority defect emerged in production
> which had to be resolved immediately. I made these changes in the trunk.
> Naturally, I wanted to merge these changes into my branch. However, no
> version of the merge command that I could come up with resulted in a
> situation that did not want to delete the newly added files. My final,
> unsatisfactory conclusion to this mess, was to do the merge and before
> committing, revert the files that it wanted to delete.
>
> I have a feeling that this was wrong, and that down the line, some future
> merge will go badly.
>
> Steve
>
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
Re: Letters at beginnings of columns of svn output
Posted by Steve Cohen <sc...@javactivity.org>.
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 subclipse plugin. I got these all the time and I could never
understand them. I've now switched to the subversive Eclipse plugin
which is even worse for merging (I've never been able replicate with it
merges that are simple on the command line) but better in other
respects, and have fallen back on a strategy of doing all merges on the
command line which seems to produce better results for the most part.
Both plugins assume a great deal of knowledge about the merge process
and their "documentation" is restricted to inadequate explanations of
what each widget in the plugin does, without explaining in real-world
terms i.e. in use cases: When you have scenario x you want to do y, etc.
The command line is better documented but even here as we see, there are
holes.
This question was sparked by the following scenario:
I had made a relatively small number of changes in a branch for future
development. Among these changes were the additions of several new
source files. As I was doing so, a higher-priority defect emerged in
production which had to be resolved immediately. I made these changes
in the trunk. Naturally, I wanted to merge these changes into my
branch. However, no version of the merge command that I could come up
with resulted in a situation that did not want to delete the newly added
files. My final, unsatisfactory conclusion to this mess, was to do the
merge and before committing, revert the files that it wanted to delete.
I have a feeling that this was wrong, and that down the line, some
future merge will go badly.
Steve
Re: Letters at beginnings of columns of svn output
Posted by Stephen Butler <sb...@elego.de>.
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 'svn' subcommand:
>>>
>>
>> There is docn for the letters for status and for update, but I haven't found
>> anything for the output from merge, which have subtle differences from the
>> above two.
>>
>> cheers, jamie
>
> exactly my point. It isn't documented for merge. In my google searches I ran across a post where someone complained about this in 2007.
You're right. This oversight has been corrected for 1.7. For the
record, here's what it says (as of r1060460):
[[[
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
Characters in the first column report about the item itself.
Characters in the second column report about properties of the item.
A 'C' in the third column indicates a tree conflict, while a 'C' in
the first and second columns indicate textual conflicts in files
and in property values, respectively.
]]]
Regards,
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
Re: Letters at beginnings of columns of svn output
Posted by Steve Cohen <sc...@javactivity.org>.
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 found
> anything for the output from merge, which have subtle differences from the
> above two.
>
> cheers, jamie
exactly my point. It isn't documented for merge. In my google searches
I ran across a post where someone complained about this in 2007.
Re: Letters at beginnings of columns of svn output
Posted by JamieEchlin <ja...@credit-suisse.com>.
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 from merge, which have subtle differences from the
above two.
cheers, jamie
--
View this message in context: http://old.nabble.com/Letters-at-beginnings-of-columns-of-svn-output-tp30714345p30717940.html
Sent from the Subversion Users mailing list archive at Nabble.com.
Re: Letters at beginnings of columns of svn output
Posted by Stephen Butler <sb...@elego.de>.
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 to a document where this is explained? It's not in the manual except for the status command.
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:
http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.update.html
Regards,
Steve
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194