On 11/16/17 06:28, Daniel Shahaf wrote:
Yuri wrote on Wed, 15 Nov 2017 08:42 -0800:
I had the directory sysutils/fd added locally (svn add). Then I
accidentally removed it (rm -rf sysutils/fd) and updated from the
central repository because somebody else committed it. After this, it
just keeps
fd/Makefile' from
pristine store, because no checksum is recorded for this file
Version 1.9.7 on FreeBSD.
Yuri
октября 2015 г. пользователь Yuri Nachitov написал:
> Hello!
>
> Does anyone install the svn server on openshift or other PaaS ?
>
>
Hello!
Does anyone install the svn server on openshift or other PaaS ?
I would make a correction here: conflicting parts could be marked up in
a different fashion:
<<<<<<< begin conflict
<... section of mine with conflicting changes...>
>>>>>>> end conflict
Otherwise it is difficult to tell where the conflict is. Maybe you can
name the file .conflicts
Yuri
p place would just contain the .mine version, and no markup.
Thanks,
Yuri
---merge-tool-cmd command---
#!/usr/bin/env python
import sys
import os.path
import time
import subprocess
import shutil
try:
# path to meld
meld = "meld"
# file paths supplied by subversion
base
conflict on them.
Somebody needs to take a close look how is this is possible.
Yuri
ver deleted those files, I added them myself locally because they
are new, but never checked them in.
And even if they were in local pending delete state, new files with the
same path coming from the repository with update should at least cause
the conflict.
What do you think?
Yuri
e'.
What do I do now? I obviously have an invalid directory, and I didn't do
anything wrong. I believe this indicates the presence of some problem in
subversion. But this Issue has been assertively closed.
Yuri
migration
but couldn't find any simple (or even any working) solution. It would be a
great help to our migration effort if someone from the Subversion team can
advice on the best way to handle this.
Thanks
Yuri Zelikov
Hello!
Is there a command line client for Windows-98?
Regards,
Yuri Popoff
11 matches
Mail list logo
