List Info

Thread: New - Symbolic Name for Working Copy




New - Symbolic Name for Working Copy
user name
2006-12-27 08:21:52
http://subversion.tigris.org/issues/show_bug.cgi?id=2683

                 Issue #|2683
                 Summary|Symbolic Name for Working Copy
               Component|subversion
                 Version|all
                Platform|All
                     URL|
              OS/Version|All
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|ENHANCEMENT
                Priority|P3
            Subcomponent|unknown
             Assigned to|issuessubversion
             Reported by|konrad_schwarz






------- Additional comments from konrad_schwarztigris.org Wed Dec 27 00:21:52 -0800 2006 -------
Subversion has symbolic revision labels "HEAD",
"BASE", ..., but is missing one
for the working copy.  Although 'svn diff' defaults to the
working copy when a
revision is omitted, I see no way of specifying it
explicitly.

Specifying the working copy revision explicitly is needed
for reverse diffs.

For example:

svn diff -r WORKING_COPY -r BASE --diff-cmd diff -x -e
some_file > some_file.ed

should produce an ed(1) script in some_file.ed that contains
the changes
required to convert the working copy to the base revision.

This comes in handy when the working copy is the result of
merging and a few of
the changes need to be backed out; this can be done cleanly
by editing
"some_file.ed" to contain only the changes that
need to be backed out and
applying the result.

As Martin Scharrer [mailinglistsmadmarty.de] has mentioned
on the mailing list,
it is possible to work around this limitation.  Therefore
this issue has type
"enhancement".

However, the functionality seems quite natural in that the
described situation
(only a subset of the changes that result from a merge are
actually desired)
will not be uncommon.

------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org

Symbolic Name for Working Copy
user name
2007-01-04 23:07:53
http://subversion.tigris.org/issues/show_bug.cgi?id=2683




User malcolm changed the following:

                What    ld value 
               |New value
============================================================
====================
              QA contact|                         
|issuessubversion
------------------------------------------------------------
--------------------
            Subcomponent|unknown                  
|libsvn_subr
------------------------------------------------------------
--------------------




------- Additional comments from malcolmtigris.org Thu Jan  4 15:07:53 -0800 2007 -------
Here's a basic patch I'm using locally (that Julian wrote)
to achieve exactly
this functionality:

Index: subversion/libsvn_subr/opt.c
============================================================
=======
--- subversion/libsvn_subr/opt.c        (revision 22899)
+++ subversion/libsvn_subr/opt.c        (working copy)
 -493,6
+493,8 
  *
  *   - For "committed", set REVISION->kind to
svn_opt_revision_committed.
  *
+ *   - For "working", set REVISION->kind to
svn_opt_revision_working.
+ *
  * If match, return 0, else return -1 and don't touch
REVISION.
  */
 static int
 -514,6
+516,10 
     {
       revision->kind = svn_opt_revision_committed;
     }
+  else if (strcasecmp (word, "working") == 0)
+    {
+      revision->kind = svn_opt_revision_working;
+    }
   else
     return -1;


Obviously it's missing the help output, at the very least. 
Also note that
currently WORKING:BASE wc-wc diffs (and probably
WORKING:repos diffs) are...
broken, to say the least.  (That's partly because there's no
way to exercise the
behaviour through the command-line client, though we
shouldn't take the
brokeness of libsvn_wc as the sole reason to include this
feature.)

------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org

[1-2]

about | contact  Other archives ( Real Estate discussion Medical topics )