Re: How to accept ~ (obstructed by item of a different kind) status files?

2023-02-21 Thread Sean McBride
On 21 Feb 2023, at 15:57, Nathan Hartman wrote: > $ svn remove --keep-local file > $ svn add file Thanks to you both. Somehow, after all these years, I had no idea you could both svn remove and svn add a file at the same path without a commit in-between. Cheers, Sean

Re: How to accept ~ (obstructed by item of a different kind) status files?

2023-02-21 Thread Nathan Hartman
On Tue, Feb 21, 2023 at 3:42 PM Jon Daley via users wrote: > > Yeah, I do: > > mv file d > svn remove file > mv d !$ > svn add !$ $ svn remove --keep-local file $ svn add file should accomplish the same thing with fewer commands. Afterwards, 'svn status' should show 'R' for Replaced. This

Re: How to accept ~ (obstructed by item of a different kind) status files?

2023-02-21 Thread Jon Daley via users
Yeah, I do: mv file d svn remove file mv d !$ svn add !$ There might be something simpler, I'm not sure, and some days I think I should put that into a script, so I don't have to retype it, but how often do I need it... (slightly off-topic, I did finally write a related script to do: "svn

How to accept ~ (obstructed by item of a different kind) status files?

2023-02-21 Thread Sean McBride
Hi all, Today I hit something I never saw before: a ~ in svn status output. Indeed, a file that is a symlink in the repo was (deliberately) changed to a plain file in my working copy. I appreciate that this could be a mistake generally, but when it's deliberate, how do I signal to svn that