From users-return-1309-daniel=haxx.se@subversion.apache.org Tue Mar 2 12:05:09 2010 Return-Path: Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9) with SMTP id o22B58gK021202 for ; Tue, 2 Mar 2010 12:05:08 +0100 Received: (qmail 15745 invoked by uid 500); 2 Mar 2010 11:05:03 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 15738 invoked by uid 99); 2 Mar 2010 11:05:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Mar 2010 11:05:03 +0000 X-ASF-Spam-Status: No, hits=2.2 required=10.0 tests=HTML_MESSAGE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [209.85.219.218] (HELO mail-ew0-f218.google.com) (209.85.219.218) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Mar 2010 11:04:56 +0000 Received: by ewy10 with SMTP id 10so63625ewy.36 for ; Tue, 02 Mar 2010 03:04:35 -0800 (PST) Received: by 10.213.109.214 with SMTP id k22mr775939ebp.83.1267527872697; Tue, 02 Mar 2010 03:04:32 -0800 (PST) Received: from tcgws000 (183-019-045-062.static.caiway.nl [62.45.19.183]) by mx.google.com with ESMTPS id 13sm2982880ewy.5.2010.03.02.03.04.31 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 02 Mar 2010 03:04:31 -0800 (PST) From: "Bert Huijben" To: "'Mark Keisler'" , References: <1dab01331003011244m4a7ecbc7n22820b000830259c@mail.gmail.com> In-Reply-To: <1dab01331003011244m4a7ecbc7n22820b000830259c@mail.gmail.com> Subject: RE: merge BASE:HEAD vs update Date: Tue, 2 Mar 2010 12:04:28 +0100 Message-ID: <016201cab9f8$217823b0$64686b10$@qqmail.nl> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_NextPart_000_0163_01CABA00.833E6070" X-Mailer: Microsoft Outlook 14.0 Thread-Index: AQH6DU6nRQFEJDelriaE7pXMWuRPOgF6E1l7 Content-Language: nl X-Virus-Checked: Checked by ClamAV on apache.org This is a multipart message in MIME format. ------=_NextPart_000_0163_01CABA00.833E6070 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit svn merge -r BASE:HEAD --dry-run Does a merge from the current revision of the root of the merge (where BASE is translated to a specific revision) to the head revision of all files and folders below the root using mergetracking. 'svn update' updates each individual path from its current revision to the HEAD revision, to make the working copies BASE represent the entire tree at HEAD. These two operations are not the same, so the results differ. Under some specific circumstances the result might be similar: E.g. when the working copy is on exactly one revision (not mixed revision). The command svn status -u (-u is short for --show-updates) Gives a better indication on what an update will retrieve, but doesn't look at the file contents to see if you would get any textual conflicts Bert Huijben From: Mark Keisler [mailto:grimm26@gmail.com] Sent: maandag 1 maart 2010 21:45 To: users@subversion.apache.org Subject: merge BASE:HEAD vs update I use svn merge -r BASE:HEAD --dry-run . to check what an update will do to me. Today, it predicted all kinds of trouble, but then update worked just fine. Why is that? % svn merge -r BASE:HEAD --dry-run . --- Merging r862 through r970 into 'TWiki/Plugins/ReqDocInfoPlugin.pm': G TWiki/Plugins/ReqDocInfoPlugin.pm --- Merging r862 through r970 into 'TWiki/Plugins/BugzillaQueryPlugin.pm': G TWiki/Plugins/BugzillaQueryPlugin.pm --- Merging r862 through r970 into 'TWiki/Plugins/ReqErrorPlugin.pm': G TWiki/Plugins/ReqErrorPlugin.pm --- Merging r862 through r970 into 'TWiki/Plugins/ReqNewDocPlugin.pm': G TWiki/Plugins/ReqNewDocPlugin.pm --- Merging r862 through r970 into 'TWiki/Plugins': C TWiki/Plugins/ReqMarkupPlugin/ReqMarkupPlugin.txt --- Merging r862 through r970 into 'TWiki/Plugins/ReqMarkupPlugin.pm': G TWiki/Plugins/ReqMarkupPlugin.pm --- Merging r862 through r970 into 'TWiki/Plugins/ReqNewReqMarkupPlugin.pm': CG TWiki/Plugins/ReqNewReqMarkupPlugin.pm --- Merging r862 through r970 into 'TWiki/Plugins': G TWiki/Plugins --- Merging r862 through r970 into 'TWiki/Contrib': C TWiki/Contrib/Dude/Utilities/MyConfig.pm C TWiki/Contrib/Dude/RM/ExportProcessor C TWiki/Contrib/Dude/RM/ConfigFiles/RmReqtTemplateStrings.txt G TWiki/Contrib Summary of conflicts: Text conflicts: 3 Tree conflicts: 2 % svn update U TWiki/Plugins/ReqMarkupPlugin/ReqMarkupPlugin.txt U TWiki/Plugins/ReqNewReqMarkupPlugin.pm U TWiki/Contrib/Dude/Utilities/MyConfig.pm Updated to revision 970. -- Mark "Blessed is he who finds happiness in his own foolishness, for he will always be happy." ------=_NextPart_000_0163_01CABA00.833E6070 Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

svn merge -r BASE:HEAD --dry-run

 

Does a merge from the current revision of the root of the merge = (where BASE is translated to a specific revision) to the head revision = of all files and folders below the root using = mergetracking.

 

'svn update' updates each individual path from its current revision = to the HEAD revision, to make the working copies BASE represent the = entire tree at HEAD.

 

These two operations are not the same, so the results = differ.

 

Under some specific circumstances the result might be similar: E.g. = when the working copy is on exactly one revision (not mixed = revision).

 

The command

svn status -u

(-u is short for --show-updates)

 

Gives a better indication on what an update will retrieve, but = doesn't look at the file contents to see if you would get any textual = conflicts

 

           &nbs= p;    Bert Huijben

 

From:= Mark = Keisler [mailto:grimm26@gmail.com]
Sent: maandag 1 maart 2010 = 21:45
To: users@subversion.apache.org
Subject: merge = BASE:HEAD vs update

 

I use svn = merge -r BASE:HEAD --dry-run . to check what an update will do to = me.  Today, it predicted all kinds of trouble, but then update = worked just fine.  Why is that?

% svn merge -r BASE:HEAD = --dry-run .
--- Merging r862 through r970 into = 'TWiki/Plugins/ReqDocInfoPlugin.pm':
 G   = TWiki/Plugins/ReqDocInfoPlugin.pm
--- Merging r862 through r970 into = 'TWiki/Plugins/BugzillaQueryPlugin.pm':
 G   = TWiki/Plugins/BugzillaQueryPlugin.pm
--- Merging r862 through r970 = into 'TWiki/Plugins/ReqErrorPlugin.pm':
 G   = TWiki/Plugins/ReqErrorPlugin.pm
--- Merging r862 through r970 into = 'TWiki/Plugins/ReqNewDocPlugin.pm':
 G   = TWiki/Plugins/ReqNewDocPlugin.pm
--- Merging r862 through r970 into = 'TWiki/Plugins':
C    = TWiki/Plugins/ReqMarkupPlugin/ReqMarkupPlugin.txt
--- Merging r862 = through r970 into = 'TWiki/Plugins/ReqMarkupPlugin.pm':
 G   = TWiki/Plugins/ReqMarkupPlugin.pm
--- Merging r862 through r970 into = 'TWiki/Plugins/ReqNewReqMarkupPlugin.pm':
CG   = TWiki/Plugins/ReqNewReqMarkupPlugin.pm
--- Merging r862 through r970 = into 'TWiki/Plugins':
 G   TWiki/Plugins
--- = Merging r862 through r970 into 'TWiki/Contrib':
C    = TWiki/Contrib/Dude/Utilities/MyConfig.pm
   C = TWiki/Contrib/Dude/RM/ExportProcessor
   C = TWiki/Contrib/Dude/RM/ConfigFiles/RmReqtTemplateStrings.txt
 G&nb= sp;  TWiki/Contrib
Summary of conflicts:
  Text = conflicts: 3
  Tree conflicts: 2
% svn = update
U    = TWiki/Plugins/ReqMarkupPlugin/ReqMarkupPlugin.txt
U    = TWiki/Plugins/ReqNewReqMarkupPlugin.pm
U    = TWiki/Contrib/Dude/Utilities/MyConfig.pm
Updated to revision = 970.

--
Mark
"Blessed is he who finds = happiness in his own foolishness, for he will always be = happy."

------=_NextPart_000_0163_01CABA00.833E6070--