[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 3449] New - text conflict flagged even though both side
From:       Stefan Sperling <stsp () elego ! de>
Date:       2009-07-23 11:51:58
Message-ID: iz3449 () subversion ! tigris ! org
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=3449
                 Issue #|3449
                 Summary|text conflict flagged even though both side match
               Component|subversion
                 Version|trunk
                Platform|All
                     URL|
              OS/Version|All
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|unknown
             Assigned to|issues@subversion
             Reported by|stsp






------- Additional comments from stsp@tigris.org Thu Jul 23 04:51:57 -0700 2009 -------
Arfrever reported this in http://svn.haxx.se/dev/archive-2009-07/0237.shtml

The reproduction script posted there (I will attach it here in a minute)
causes a spurious text conflict during svn update:

<<<<<<< .mine
                MESSAGE("Subversion not found. No revision number will be used")
        ENDIF()
=======
                MESSAGE("Subversion not found. No revision number will be used")
        ENDIF()
ELSE()
        SET(CMAKE_KVIRC_BUILD_REVISION ${MANUAL_REVISION})
        MESSAGE("-- Current revision has been manually set to ${MANUAL_REVISION}
")
>>>>>>> .r3332
ELSE()
        SET(CMAKE_KVIRC_BUILD_REVISION ${MANUAL_REVISION})
        MESSAGE("-- Current revision has been manually set to ${MANUAL_REVISION}
")


A similar problem during a merge was reported in
http://svn.haxx.se/users/archive-2009-07/0689.shtml

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=2374753

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@subversion.tigris.org].
[prev in list] [next in list] [prev in thread] [next in thread]