work-in-progress tree conflicts diff, please comment
Stefan Sperling
stsp at elego.de
Tue Jan 6 04:56:58 CST 2009
On Tue, Jan 06, 2009 at 04:55:09AM -0500, C. Michael Pilato wrote:
> Stefan Sperling wrote:
> > + <para>Since Subversion 1.6, this and other similar situations
> > + are flagged as conflicts in the working copy. As with textual
> > + conflicts, tree conflicts prevent a commit from being made
>
> Ha! You even said "textual conflicts" here. :-) Maybe that should show up
> as a <firstterm> somewhere in the section that talks about those types of
> conflicts?
The first time this term occurs is on page 23,
where example output of svn status is listed:
? scratch.c # file is not under version control
A stuff/loot/bloo.h # file is scheduled for addition
C stuff/loot/lump.c # file has textual conflicts from an update
D stuff/fish.c # file is scheduled for deletion
M bar.c # the content in bar.c has local modifications
I don't think it's worth highlighting the term there.
Adding another paragraph just to be able to highlight
the term would be a bit silly, wouldn't it?
Stefan
More information about the svnbook-dev
mailing list