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

Merging displays different information

From: farlin <farlin_at_gmail.com>
Date: Wed, 6 Aug 2008 17:38:28 -0700 (PDT)

Dear All,

We have been using 1.4 version of tortoise for maintaining our
repository version for a while now. Recently we also have upgraded the
client side to use 1.5.2, and may I say I just love the new interface.

I have a question though, while merging does the merging technique in
CLI differs from the merging technique at GUI? I have tried a merge
between trunk and branch and CLI provides a different reading in the
merge log to that of GUI's log.

CLI reported : 13 conflicts, 3 deleted, 27 added and 10 skipped.
GUI reported : 2 conflicts, 1 deleted, 38 added and 10 skipped.

However, when we checked the outcome, we got same number of conflict
output. There was actually 13 conflicted files.

Here are my questions:

1. Does GUI's default setting ignores anything, why was it catching
conflicts and marking them as ADD?
2. what is the proper CLI imitation command for the GUI's default
merge settings?

3. How can I make sure both replies same way, because we would require
merging code very frequently and we do not wish to spend too much time
worrying about the merger.

---------------------------------------------------------------------------------------------------------
GUI : TortoiseSVN 1.5.2, Build 13595 - 32 Bit , 2008/07/31 17:04:57
Subversion 1.5.1,
apr 1.2.12
apr-utils 1.2.12
berkeley db 4.4.20
neon 0.28.2
OpenSSL 0.9.8g 19 Oct 2007
zlib 1.2.3
---------------------------------------------------------------------------------------------------------
CLI : svn, version 1.5.0 (r31699)
   compiled Jun 23 2008, 12:59:48

Copyright (C) 2000-2008 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http://
www.Collab.Net/)

The following repository access (RA) modules are available:

* ra_neon : Module for accessing a repository via WebDAV protocol
using Neon.
  - handles 'http' scheme
  - handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network
protocol.
  - with Cyrus SASL authentication
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme
--------------------------------------------------------------------------------------------------------------

Thanks a lot for reading my mail, please let me know if you need any
information.

--
Farlin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-07 07:01:46 CEST

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