On Oct 7, 2009, at 10:41 PM, Carl Jolly wrote:
> Thanks for the quick response but I don't think you answered the
> question. I was notified of the confict by syncing user 2's
> repository with the server using the "fossil update" command. Your
> "then resolve the conflict locally" is wh
*Thanks for the quick response but I don't think you answered the
question. I was notified of the confict by syncing user 2's repository with
the server using the "fossil update" command. Your "then resolve the
conflict locally" is what I want information on as there does not appear to
be any w
You need to sync the server back to the user 2 first, then resolve the
conflict locally and push back to server.
(I'm guessing this is your 1st time around the block with a DVCS?)
2009/10/8 Carl Jolly :
> I'm at my wits end. I am trying out fossil and I have created two users and
> one
> server.
I'm at my wits end. I am trying out fossil and I have created two users and
one
server. I have made changes to the same file in both user repositories. I
have updated the server respository with the change from one user and now
when I do an update for the second user I get a CONFLICT message for th
Andreas Kupries wrote:
> See file
> c2f_fossil.tcl
>
> That contains the code exec'ing fossil.
> Look for the 'Do ...' calls.
>
> cvs2fossil basically imports the files first, by revision, using some test-
> commands to setup the delta-chain. Then it uses some more test- commands to
> im
Rene de Zwart wrote:
> I wonder what the sequence is for importing cvs files into fossil. I tried
> to get it from cvs2fossil but got lost.
>
> first you need to get a commit identifier?
> assume the following cvs-repository 'example'
> first.c with rev 1.1 1.2 1.3 1.4
> second.c with rev 1.1 1.2
I wonder what the sequence is for importing cvs files into fossil. I tried
to get it from cvs2fossil but got lost.
first you need to get a commit identifier?
assume the following cvs-repository 'example'
first.c with rev 1.1 1.2 1.3 1.4
second.c with rev 1.1 1.2 1.3 1.4 and only one user user1
co
Andreas Kupries wrote:
> Ramon Ribó wrote:
> What about the third option ? I.e. editing cvs2fossil instead of developing
> from scratch ?
Another option: write fossil support for tailor -
http://progetti.arstecnica.it/tailor - which would give migration
support to a large number of other VCS / D
Ramon Ribó wrote:
> Andreas,
>
> The problems were:
Thanks.
> 1- I have been trying to use the tool cvs2fossil with a simple, few
> files, no branches, small cvs project. For testing. Results:
>
>a) changed tag branch ---> branch new in file c2f_fossil.tcl (this
> error has been discus
Andreas,
The problems were:
1- I have been trying to use the tool cvs2fossil with a simple, few
files, no branches, small cvs project. For testing. Results:
a) changed tag branch ---> branch new in file c2f_fossil.tcl (this
error has been discussed in the list but is not corrected in the
Stephen De Gabrielle wrote:
> Is there a way of importing issues into the issue tracker?
BTW I asked my friend who did a lot of SD work over the summer; she's
really hosed with MIT classes now until mid-December, and suggests
emailing sa...@bestpractical.com
I'd personally be willing to put say $
Ramon Ribó wrote:
>> Oh. I didn't know about these (while writing cvs2fossil). Which is why I put
>> this information into the new commit message. Since when do they exist ?
>
> Andreas, I see that you are the developer of cvs2fossil. I have tried it
> and I
> have had some problems with it (th
> Oh. I didn't know about these (while writing cvs2fossil). Which is why I put
> this information into the new commit message. Since when do they exist ?
Andreas, I see that you are the developer of cvs2fossil. I have tried it and I
have had some problems with it (the details are in another mess
D. Richard Hipp wrote:
> On Oct 7, 2009, at 12:01 PM, Ramon Ribó wrote:
>
>> 1- If someone wants to create a new cvs2fossil, what command can be
>> used to commit a
>> file with an ancient date?
>
> Use undocumented flags to commit:
>
> --date-override 2009-10-06T12:34:56
> --user-ov
On Oct 7, 2009, at 12:01 PM, Ramon Ribó wrote:
> 1- If someone wants to create a new cvs2fossil, what command can be
> used to commit a
> file with an ancient date?
Use undocumented flags to commit:
--date-override 2009-10-06T12:34:56
--user-override userid
>
> 2- How to revert a
1- If someone wants to create a new cvs2fossil, what command can be
used to commit a
file with an ancient date?
2- How to revert a file to a different version but saving with a
different name?
___
fossil-users mailing list
fossil-users@lists.fossil
> You can. Just type:
>
> fossil comment file1 file2 ...
>
> and it will only commit the files named.
Thanks for the info. I have implemented the commit file by file in RamDebugger.
If someone wants to try it, fossil rep is here:
http://www.compassis.com:8079/c/ramdebugger/home
Standard Ram
On Oct 7, 2009, at 7:11 AM, Ramon Ribó wrote:
> Shouldn't it be
> possible to make
> a commit that includes only some of the modified files?
You can. Just type:
fossil comment file1 file2 ...
and it will only commit the files named.
D. Richard Hipp
d...@hwaci.com
___
Hello,
In order to proceed with my evaluation of fossil, I have made two things:
1 - Create a fossil repository for RamDebugger (unfortunately the cvs history
of RamDebugger cannot be included into the repository as cvs2fossil does
not work)
2- Add functionality to RamDebugger
On 4 Oct 2009, at 13:00, fossil-users-requ...@lists.fossil-scm.org
wrote:
> 5- How to make a gdiff of two repository versions (not a diff a
> gdiff)? I've tried to make a gdiff of current version with a
> repository version (the first chars of the sha of the version) , like
> this:
>
>fossi
20 matches
Mail list logo
