Re: svn update issue?

[Nathan Hartman]

On Fri, Sep 10, 2021 at 4:45 AM Mikael Stålhammar <
mikael_stalham...@hotmail.com> wrote:

> I'm wondering if the behavior of "svn update" is correct in this below
> case:
>
> I have a file in my local working copy containing a change on one line in
> the file.
> Meanwhile the file is modified and committed by someone else, with a
> change to another line in that file.
> It turns out that that change made by the other person was wrong, so I
> want to stick with the contents of the file I have, so I do a:
>
> svn update  --accept mf
>


This would have an effect only if SVN detects conflicts it can't resolve
automatically when merging the repository's changes with your working
copy's changes. For example, that would happen if your colleague and you
both changed the same lines of the file (with non-identical changes).

In your case it sounds like there was no conflict as two different parts of
the file were edited.

One way to achieve what you want is to reverse cherry pick merge the bad
commit. (If it contains other changes you do want to keep, you can
selectively revert them using your favorite diff tool.)

See:
https://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo

Depending on the situation and whether your colleague's changes and yours
are related or not, it might be better to commit the "revert" commit
separately from your other changes so that it will be clear why it's being
reverted and can be explained in the log. You could do that either before
or after committing your own changes, or just in one combined commit,
depending on what is best in your circumstances.


(i.e. mf=mine-full)
> to mark my version as being merged with HEAD, but keeping my source as it
> is. However, what really happens is that the changes from that other
> revision still gets merged into my local source, while I expected the
> contents of my version to remain unchanged.
>


Note that your colleague's committed changes will not show up in a 'svn
diff' now since you are comparing your working copy with what's in the
repository (at the time of 'svn update') but reverse cherry picking that
commit will make those lines as they were before, and will make them show
up in the diff as changed.

Hope this helps,
Nathan

svn update issue?

[Mikael Stålhammar]

I'm wondering if the behavior of "svn update" is correct in this below case:

I have a file in my local working copy containing a change on one line in the 
file.
Meanwhile the file is modified and committed by someone else, with a change to 
another line in that file.
It turns out that that change made by the other person was wrong, so I want to 
stick with the contents of the file I have, so I do a:

svn update  --accept mf

(i.e. mf=mine-full)
to mark my version as being merged with HEAD, but keeping my source as it is. 
However, what really happens is that the changes from that other revision still 
gets merged into my local source, while I expected the contents of my version 
to remain unchanged.

The svn client I'm using:
svn version 1.14.1-SlikSvn (SlikSvn/1.14.1)

Regards
Mikael

Re: svn update issue

[Pavel Lyalyakin]

Stefan,

On Wed, Jul 20, 2016 at 11:47 AM, Stefan  wrote:
> On 7/19/2016 23:26, Pavel Lyalyakin wrote:
>> Hello,
>>
>> On Tue, Jul 19, 2016 at 10:44 PM, ujjwala kaushik
>>  wrote:
>>> Hi,
>>>
>>> I am using a I-Mac(Macintosh)  and I am trying to update the svn from 
>>> terminal. I had a old version which I uninstalled and then installed the 
>>> latest subversion. The latest 1.9.2 is there on my system but I cannot 
>>> update my files using that. I get the error message below:
>>>
>>> What should i do? Any help would be appreciated.
>>>
>>> en4102194:~ ujjwalak15$ svn update
>>>
>>> Skipped '.'
>>>
>>> svn: E155007: None of the targets are working copies
>> The error means that the current working directory where you run `svn
>> update` is not a Subversion working copy. Make sure to provide correct
>> path to the working copy you are trying to update.
>>
>> BTW, make sure to `svn upgrade`[*] your working copies after upgrading
>> SVN client to 1.9 from 1.8 or older version. It's not related to the
>> error you've specified, though.
>>
>> [*]: http://svnbook.red-bean.com/en/1.8/svn.ref.svn.c.upgrade.html
> Pavel, svn upgrade is not required if you upgrade from 1.8 to 1.9 (only
> if u upgrade from <= 1.7 to >= 1.8) as far as I know, or am I wrong
> (aka: the WC format stayed the same between 1.8 and 1.9 [1])?
>
> [1] https://subversion.apache.org/docs/release-notes/1.9.html#wc-upgrade

Yep, you are right. I should've said that `svn upgrade` is required
when upgrading the SVN client to 1.9 from 1.7 or older. When upgrading
from 1.8 to 1.9 `svn upgrade` is not needed.

--
With best regards,
Pavel Lyalyakin
VisualSVN Team

Re: svn update issue

[Stefan]

On 7/19/2016 23:26, Pavel Lyalyakin wrote:
> Hello,
>
> On Tue, Jul 19, 2016 at 10:44 PM, ujjwala kaushik
>  wrote:
>> Hi,
>>
>> I am using a I-Mac(Macintosh)  and I am trying to update the svn from 
>> terminal. I had a old version which I uninstalled and then installed the 
>> latest subversion. The latest 1.9.2 is there on my system but I cannot 
>> update my files using that. I get the error message below:
>>
>> What should i do? Any help would be appreciated.
>>
>> en4102194:~ ujjwalak15$ svn update
>>
>> Skipped '.'
>>
>> svn: E155007: None of the targets are working copies
> The error means that the current working directory where you run `svn
> update` is not a Subversion working copy. Make sure to provide correct
> path to the working copy you are trying to update.
>
> BTW, make sure to `svn upgrade`[*] your working copies after upgrading
> SVN client to 1.9 from 1.8 or older version. It's not related to the
> error you've specified, though.
>
> [*]: http://svnbook.red-bean.com/en/1.8/svn.ref.svn.c.upgrade.html
Pavel, svn upgrade is not required if you upgrade from 1.8 to 1.9 (only
if u upgrade from <= 1.7 to >= 1.8) as far as I know, or am I wrong
(aka: the WC format stayed the same between 1.8 and 1.9 [1])?

[1] https://subversion.apache.org/docs/release-notes/1.9.html#wc-upgrade

Regards,
Stefan



smime.p7s
Description: S/MIME Cryptographic Signature

Re: svn update issue

[Pavel Lyalyakin]

Hello,

On Tue, Jul 19, 2016 at 10:44 PM, ujjwala kaushik
 wrote:
>
> Hi,
>
> I am using a I-Mac(Macintosh)  and I am trying to update the svn from 
> terminal. I had a old version which I uninstalled and then installed the 
> latest subversion. The latest 1.9.2 is there on my system but I cannot update 
> my files using that. I get the error message below:
>
> What should i do? Any help would be appreciated.
>
> en4102194:~ ujjwalak15$ svn update
>
> Skipped '.'
>
> svn: E155007: None of the targets are working copies

The error means that the current working directory where you run `svn
update` is not a Subversion working copy. Make sure to provide correct
path to the working copy you are trying to update.

BTW, make sure to `svn upgrade`[*] your working copies after upgrading
SVN client to 1.9 from 1.8 or older version. It's not related to the
error you've specified, though.

[*]: http://svnbook.red-bean.com/en/1.8/svn.ref.svn.c.upgrade.html

--
With best regards,
Pavel Lyalyakin
VisualSVN Team

svn update issue

[ujjwala kaushik]

Hi,

I am using a I-Mac(Macintosh)  and I am trying to update the svn from
terminal. I had a old version which I uninstalled and then installed the
latest subversion. The latest 1.9.2 is there on my system but I cannot
update my files using that. I get the error message below:

What should i do? Any help would be appreciated.

en4102194:~ ujjwalak15$ svn update

Skipped '.'

svn: E155007: None of the targets are working copies


Thanks
*Ujjwala*