Excuse my ignorance, I'm used to cvs.
I edited some files at the same time as a colleague, but when we realized,
he went forward, so my copies were obsolete.
Some time later, I tried to update, to get the new files, and to get his
updated version.
It reported the files changed, just as I would s
Is your .svn directory available or that too is deleted ?
which version of svn are you using ?
Prabhu
On Monday 25 April 2011 08:04 PM, dov.kru...@americas.bnpparibas.com wrote:
Excuse my ignorance, I'm used to cvs.
I edited some files at the same time as a colleague, but when we
realized,
On Apr 25, 2011, at 09:34, dov.kru...@americas.bnpparibas.com wrote:
> Excuse my ignorance, I'm used to cvs.
I have never used cvs, so my advice may not exactly correspond.
> I edited some files at the same time as a colleague, but when we realized, he
> went forward, so my copies were obsole
On Apr 25, 2011, at 09:43, Ryan Schmidt wrote:
>> I tried to update, to get the new files, and to get his updated version.
>>
>> It reported the files changed, just as I would see in cvs:
>>
>> CA.txt
>
> Ok, a conflict occurred
In fact, the current version of Subversion would have ask
Ryan Schmidt wrote on Mon, Apr 25, 2011 at 09:43:03 -0500:
>
> On Apr 25, 2011, at 09:34, dov.kru...@americas.bnpparibas.com wrote:
>
> > Subversion just reports the current version number and does not try to
> > bring the files in as cvs would.
>
> This should indeed have brought back the cur
Take it as fact that I'm not interested in my version of the file. So
anything svn may have decided about resolving collisions is irrelevant.
I want to get rid of my version of the file and get the one in the
archive. I think the reason for my confusion was that the file itself no
longer exis
Guten Tag dov.kru...@americas.bnpparibas.com,
am Montag, 25. April 2011 um 17:08 schrieben Sie:
> Take it as fact that I'm not interested in my version of the file. So
> anything svn may have decided about resolving collisions is irrelevant.
Subversion can't know that until you tell it to know,
i've a checked out, without externals, not using serf:
https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/
and get a:
$ svn up --ignore-externals
svn: Error running context: Internal error
this is on solaris, after switching to serf in ~/.subversion. i am not
sure if this should work without p
Hi everyone. I'm developing a program on Ubuntu 10.10. The directory in which
my project lives is part of my PATH. The executable that is built is called
'autobot'.
I type:
ln autobot a
a
(And my program runs correctly).
svn add a
svn propset svn:executable ON a
svn ci -m "Create short
Further experimentation shows that symbolic links work (ln -s autobot a for the
first command). Are hard links supposed to work?
Richard
- Original Message -
From: richard Cavell
Sent: 04/26/11 10:36 AM
To: users@subversion.apache.org
Subject: How to create a link that works between OS
(moving top posting to bottom)
- Original Message -
From: richard Cavell
Sent: 04/26/11 10:36 AM
To: users@subversion.apache.org
Subject: How to create a link that works between OS X and Ubuntu
Hi everyone. I'm developing a program on Ubuntu 10.10. The
directory in which my pr
On Apr 25, 2011, at 22:27, David Chapman wrote:
> On 4/25/2011 7:38 PM, richard Cavell wrote:
>> Further experimentation shows that symbolic links work (ln -s autobot a for
>> the first command). Are hard links supposed to work?
>
> The hard link simply creates a new name for the file, which is
The link count for autobot and a1 will be 2; each name references the same file
on disk. The symbolic link, however, is a pointer to a name. You can replace
the file autobot without affecting a2, but if you replace autobot (rm autobot;
make autobot) you will find that the connection between auto
Hi, Michael,
The only thing I would refrain from is putting the repo via file:// URL on a
network drive. The setup might be easier than setting up svnserve or apache,
but locking on network drives is a very fragile issue, and AFAICS all projects
involving locking (SVN, SQLite, BerkeleyDB, ...)
14 matches
Mail list logo
