Re: svn up --paranoid [was "Disabling automatic conflict resolution" ]

[kf...@collab.net]

"Wadsworth, Eric (Contractor)" <wa...@fhu.disa.mil> writes:
> Her lines of code were merged with what was in the repository. If she wants
> to restore this file in her working copy to its state before the "svn up"
> command was executed, she must manually go through the file, line-by-line,
> and remove lines added by the merge process. The original file, premerged,
> is lost (though all of the lines of code are preserved in the merged file,
> they much be manually sorted out).

That's not true.  Consider:

   $ svn up
   G  foo.txt    <-- oh no, repos changes merged into modified local copy
   $ svn diff foo.txt > my-adjusted-changes.txt
   $ svn up -r<EARLIER_REV> foo.txt
   G foo.txt
   $ 

The local changes to foo.txt should be preserved.  Even if I'm wrong
about that (I haven't bothered to test it), she could still do the
following at this point:

   $ patch foo.txt < my-adjusted-changes.txt

So it's not hard to get back to the original modified state, if she
really needs to.

-Karl


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: svn up --paranoid [was "Disabling automatic conflict resolution" ]

["Jay Freeman (saurik)" <sa...@saurik.com>]

Karl:

This doesn't quite work because, as someone else mentioned (cmpilato I
think?) changes that were the same both locally and remotely are destroyed
during this process. The information content is lost as no one bothers to
record it. The way Subversion currently stands (unlike CVS, which is an
important note; see my e-mail on the other thread), you can't recover from a
merge process if it went horribly wrong.

Sincerely,
Jay Freeman (saurik)
saurik@saurik.com

----- Original Message -----
From: <kf...@collab.net>
To: "Wadsworth, Eric (Contractor)" <wa...@fhu.disa.mil>
Cc: <cm...@collab.net>; <ja...@jrv.org>;
<us...@subversion.tigris.org>; <de...@subversion.tigris.org>
Sent: Monday, August 18, 2003 10:01 AM
Subject: Re: svn up --paranoid [was "Disabling automatic conflict
resolution" ]


...
> That's not true.  Consider:
>
>    $ svn up
>    G  foo.txt    <-- oh no, repos changes merged into modified local copy
>    $ svn diff foo.txt > my-adjusted-changes.txt
>    $ svn up -r<EARLIER_REV> foo.txt
>    G foo.txt
>    $
...
> -Karl


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn up --paranoid [was "Disabling automatic conflict resolution" ]

["Jay Freeman (saurik)" <sa...@saurik.com>]

Karl:

This doesn't quite work because, as someone else mentioned (cmpilato I
think?) changes that were the same both locally and remotely are destroyed
during this process. The information content is lost as no one bothers to
record it. The way Subversion currently stands (unlike CVS, which is an
important note; see my e-mail on the other thread), you can't recover from a
merge process if it went horribly wrong.

Sincerely,
Jay Freeman (saurik)
saurik@saurik.com

----- Original Message -----
From: <kf...@collab.net>
To: "Wadsworth, Eric (Contractor)" <wa...@fhu.disa.mil>
Cc: <cm...@collab.net>; <ja...@jrv.org>;
<us...@subversion.tigris.org>; <de...@subversion.tigris.org>
Sent: Monday, August 18, 2003 10:01 AM
Subject: Re: svn up --paranoid [was "Disabling automatic conflict
resolution" ]


...
> That's not true.  Consider:
>
>    $ svn up
>    G  foo.txt    <-- oh no, repos changes merged into modified local copy
>    $ svn diff foo.txt > my-adjusted-changes.txt
>    $ svn up -r<EARLIER_REV> foo.txt
>    G foo.txt
>    $
...
> -Karl


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org