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

Applying a patch multiple times

From: Yannick Berker <bers_at_gmx.net>
Date: Thu, 2 Apr 2009 08:58:54 +0200

Hi everybody,

 

I'm have been using TortoiseSVN 1.60 lately and noticed some weired
behavior:

 

Revision 1 of my file looks like this:

(1) 1

(2) 3

(3) 4

(4)

 

Now I add the line 2 (you guess where) and create a patch - it looks like
this:

(1) Index: new.txt

(2) ===================================================================

(3) --- new.txt (revision 1)

(4) +++ new.txt (working copy)

(5) @@ -1,3 +1,4 @@

(6) 1

(7) +2

(8) 3

(9) 4

(10)

 

When I now revert my file to revision 1, I correctly get 1-3-4.

 

Now I apply the patch which results in 1-2-3-4. Now I apply the patch again,
and I already notice that TortoiseSVN does not mark the filename as "red"
which signifies something like "file is different from the version in
repository". I does not reload revision 1 from the repository, but appies to
patch to the already patches file which results in 1-2-2-3-4 without any
conflict.

 

Now I apply the patch AGAIN and see that TortoiseSVN correctly marks the
file as "red". Patching results in a conflict.

 

Is this intended behaviour? Is this a feature or bug, and does it come from
SVN or TortoiseSVN?

 

In addition to that, when creating a patch for a directory containing
unversioned files and including these unversioned files (like 1-2-3) in the
patch file, applying the patch multiple times results in multiplication of
the contents of the unversioned file. That is, after the second patching,
the unversioned contain their contents twice (1-2-3-1-2-3), after the third
time it's 1-2-3-1-2-3-1-2-3 and so on - I think you get the point. Is this
intended behavior?

 

Greets,

Yannick

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1515063

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

  • application/octet-stream attachment: new.patch
Received on 2009-04-02 09:00:26 CEST

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