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

Re: I need help in SVN mv and SVN cp

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 17 Aug 2016 11:38:01 +0200

On Wed, Aug 17, 2016 at 02:50:58PM +0530, rags bhat wrote:
> This is what available in the patch file
>
>
> Index: Makefile
> ===================================================================
> diff --git a/branches/Makefile
> deleted dile mode 106444
> -- a/branches/Makefile (revision XXX)
> ++ /dev/null (working copy)
>
> -
> -
> removed all lines with - symbol
>
> Index: Makefilecp
> ===================================================================
> diff --git a/branches/Makefilecp
> copy from branches/Makefile_at_revision
> copy to branches//Makefilecp
> Index: Makefilemv
> ===================================================================
> diff --git a/branches/Makefile b/branches/Makefilemv
> copy from branches/Makefile_at_revision
> copy to branches/Makefilemv
>
> *Thanks & Regards*,
> Raghavendra Bhat

Yes, this seems to be broken indeed.

$ svn diff --git
Index: beta
===================================================================
diff --git a/trunk/beta b/trunk/beta
deleted file mode 10644
--- a/trunk/beta (revision 2)
+++ /dev/null (nonexistent)
@@ -1 +0,0 @@
-beta
Index: betacp
===================================================================
diff --git a/trunk/beta b/trunk/betacp
copy from trunk/beta_at_2
copy to trunk/betacp
Index: betamv
===================================================================
diff --git a/trunk/beta b/trunk/betamv
copy from trunk/beta_at_2
copy to trunk/betamv
$ svn diff --git > ../p
$ cd ../branch/
$ patch --strip 1 ../p
$ svn patch --strip 1 ../p
D beta
Skipped missing target: 'betacp'
Skipped missing target: 'betamv'
Summary of conflicts:
  Skipped paths: 2

Could you please file an issue in our bug tracker?
https://issues.apache.org/jira/issues/?jql=project%20%3D%20SVN
Received on 2016-08-17 11:38:15 CEST

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