SVN: diff not showing effect of merge

Question

I'm apparently not understanding SVN.

I'm at revision 15140:

$ svn info
Revision: 15140

$ svn diff -r 15092:HEAD MyFile.pm
Index: MyFile.pm
===================================================================
--- MyFile.pm   (revision 15092)
+++ MyFile.pm   (revision 15140)
@@ -34,7 +34,7 @@

 sub myMethod {
     my ( $self, $args ) = @_;
-
+    
     my $prog_obj = $self->prog_obj;
     my $session  = $prog_obj->session;

Now I don't like that my revision contains the worthless whitespace modification, so I want to get rid of that change entirely.

svn merge -c 15092 MyFile.pm
svn commit -m "Removing whitespace update"
svn update

Now if I do the diff again, it should be gone, right?

$ svn diff -r 15092:HEAD MyFile.pm
Index: MyFile.pm
===================================================================
--- MyFile.pm   (revision 15092)
+++ MyFile.pm   (revision 15140)
@@ -34,7 +34,7 @@

 sub myMethod {
     my ( $self, $args ) = @_;
-
+    
     my $prog_obj = $self->prog_obj;
     my $session  = $prog_obj->session;

Nope.

What am I misunderstanding?

Ben Reser · Accepted Answer · 2014-02-26 23:34:42Z

1

You probably meant to do:

svn merge -c -15092 MyFile.pm

Note the minus before the revision number, which specifies this is a reverse merge.

Trying to merge a revision on a branch (or trunk) that was committed directly to that branch (or trunk) doesn't do anything.

Your commit command then does nothing because there's nothing to commit.

answered Feb 26, 2014 at 23:34

Ben Reser

5,7751 gold badge24 silver badges29 bronze badges

Sign up to request clarification or add additional context in comments.

1 Comment

Lurk21 Over a year ago

Sadly that didn't work for me either, and I eventually gave up

Collectives™ on Stack Overflow

SVN: diff not showing effect of merge

1 Answer 1

1 Comment

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

1 Comment

Your Answer

Sign up or log in

Post as a guest

Related