[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Bug in 1.1.0rc1

From: \\ <Matthew.Campbell_at_Relizon.com>
Date: 2004-08-13 15:55:05 CEST

I made local mods to a dir-prop in my working copy. I then merged changes from
trunk into the same working copy, before commit. As you see below, merge
indicates only updates for all nodes. Subsequent commit fails due to conflicted
state of directory node. Merge should have somehow indicated directory node
conflict. (" C"?)

Searching the issue tracker, I found #1957 which includes in its description:
"[merge is] giving no indication that there is a conflicted state here until the
user runs 'svn st'." I'm intuiting that these 2 issues are related - both are
instances of merge not reporting a state of conflict. So my question is, does
my issue fall under issue #1957, or should I file a separate issue in the
tracker?

Command-line transcript (slightly redacted):
-----8<-----
mcampbell@devbox /devel/working/abc7353
$ svn merge -r77:84 http://svn.company.com/svn/Stlouis/trunk/abc
U abc.menu
 U .

mcampbell@devbox /devel/working/abc7353
$ svn ci -m "Merged revisions 77:84 of /Stlouis/trunk/abc to
/Stlouis/branches/abc7353"
svn: Commit failed (details follow):
svn: Aborting commit: '/ecrm/devel/working/abc7353' remains in conflict

mcampbell@devbox /devel/working/abc7353
$ svn st
? dir_conflicts.prej
 C .
M abc.menu

mcampbell@md15ux06 /devel/working/abc7353
$ cat dir_conflicts.prej
Property 'Custom:task-id' locally changed to '7353', but update sets it to '7954'

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 13 15:55:31 2004

This is an archived mail posted to the Subversion Users mailing list.