Re: [fossil-users] Conflict resolution

[D. Richard Hipp]

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 what I want information on as  
> there does not appear to be any way to determine what the conflict  
> is.  Usually with CVS or subversion you get a copy of the file with  
> a special extension   that either tells you that it is the main  
> trunks version of the file. You can then merge it with your version  
> of the file to arrive at a version that is compatible with the  
> server version.  Fossil is not doing that for me so how do I resolve  
> a conflict.
> user 1 - > change file x
> user 1 ->  fossil commit -m "changes to x "
> user 1 ->  fossil update
> user 2 -> change file x
> user 2 -> fossil commit -m "my changes to x"
> user 2 -> fossil update
> CONFLICT  x
>

Bring file x up in your text editor.  Locate the conflict.  (Search  
for >).  Then resolve the conflict manually.


>
>
> Re: [fossil-users] Conflict resolution
> Alec Clews
> Wed, 07 Oct 2009 19:25:19 -0700
>
> 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 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 that
> > file. This is what I would expect. So now I go to the directory  
> where the
> > file exists in the 2nd users file system, expecting to find a   
> diff or a
>
> > second copy of the file to manually merge but there is nothing. So  
> in fossil
> > how do you resolve conflicts. I have looked in the documentation and
> > searched the web for over 2 hrs to try and answer this basic  
> question and I
>
> > have found nothing.  Hopefully, it means that its something so  
> trivial that
> > it need no documentation. I hope so!
> >
> > Carl
> >
> > ___
> > fossil-users mailing list
>
> > fossil-users@lists.fossil-scm.org
> > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
> >
> >
>
>
>
> -- 
> Alec Clews
> Personal  Melbourne, Australia.
> Jabber:  aleccl...@jabber.org.au PGPKey ID: 0x9BBBFC7C
>
> blog:http://alecthegeek.wordpress.com/
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
>
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

D. Richard Hipp
d...@hwaci.com



___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Conflict resolution

[Carl Jolly]

 *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 way to determine what the conflict is.  Usually with CVS or
subversion you get a copy of the file with a special extension   that either
tells you that it is the main trunks version of the file. You can then merge
it with your version of the file to arrive at a version that is compatible
with the server version.  Fossil is not doing that for me so how do I
resolve a conflict.
*user 1 - > change file x
user 1 ->  fossil commit -m "changes to x "
user 1 ->  fossil update
user 2 -> change file x
user 2 -> fossil commit -m "my changes to x"
user 2 -> fossil update
CONFLICT  x



Re: [fossil-users] Conflict resolution

Alec Clews
Wed, 07 Oct 2009 19:25:19 -0700

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 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 that
> file. This is what I would expect. So now I go to the directory where the
> file exists in the 2nd users file system, expecting to find a  diff or a
> second copy of the file to manually merge but there is nothing. So in fossil
> how do you resolve conflicts. I have looked in the documentation and
> searched the web for over 2 hrs to try and answer this basic question and I
> have found nothing.  Hopefully, it means that its something so trivial that
> it need no documentation. I hope so!
>
> Carl
>
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
>



-- 
Alec Clews
Personal  Melbourne, Australia.
Jabber:  aleccl...@jabber.org.au PGPKey ID: 0x9BBBFC7C
blog:http://alecthegeek.wordpress.com/
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Conflict resolution

[Alec Clews]

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 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 that
> file. This is what I would expect. So now I go to the directory where the
> file exists in the 2nd users file system, expecting to find a  diff or a
> second copy of the file to manually merge but there is nothing. So in fossil
> how do you resolve conflicts. I have looked in the documentation and
> searched the web for over 2 hrs to try and answer this basic question and I
> have found nothing.  Hopefully, it means that its something so trivial that
> it need no documentation. I hope so!
>
> Carl
>
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
>



-- 
Alec Clews
Personal  Melbourne, Australia.
Jabber:  aleccl...@jabber.org.au PGPKey ID: 0x9BBBFC7C
blog:http://alecthegeek.wordpress.com/
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] Conflict resolution

[Carl Jolly]

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 that
file. This is what I would expect. So now I go to the directory where the
file exists in the 2nd users file system, expecting to find a  diff or a
second copy of the file to manually merge but there is nothing. So in fossil
how do you resolve conflicts. I have looked in the documentation and
searched the web for over 2 hrs to try and answer this basic question and I
have found nothing.  Hopefully, it means that its something so trivial that
it need no documentation. I hope so!

Carl
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Some questions about fossil [importing cvs]

[Andreas Kupries]

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 
> import the changesets, i.e. sets of file revisions.

Another trick useful in such circumstances:

mv fossil __fossil

echo <<"eof"
#!/bin/sh
echo fossil $* > /your/log/file
__fossil $*
"eof" > fossil

Essentially create a shell script wrapper around the application which logs the 
invokations and their arguments.

-- 
Sincerely,
 Andreas Kupries 
 Developer @
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Some questions about fossil [importing cvs]

[Andreas Kupries]

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 1.3 1.4 and only one user user1
> 
> commit 1 first.c rev 1.1
> 
> commit 2 first.c rev 1.2 second.c rev 1.1
> 
> commit 3 first.c rev 1.3 second.c rev 1.2
> 
> commit 4  second.c rev 1.3
> 
> commit 5 first.c rev 1.4 second.c 1.4
> 
> cvs2fossil does
> create repository 'example' with user1?
> then
> first.c rev 1.1 1.2 1.3 1.4
> and then
> second.c rev 1.1 1.2 1.3 1.4
> 
> which test-? are used to accomplish this?

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 
import the changesets, i.e. sets of file revisions.


-- 
Sincerely,
 Andreas Kupries 
 Developer @
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Some questions about fossil [importing cvs]

[Rene de Zwart]

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

commit 1 first.c rev 1.1

commit 2 first.c rev 1.2 second.c rev 1.1

commit 3 first.c rev 1.3 second.c rev 1.2

commit 4  second.c rev 1.3

commit 5 first.c rev 1.4 second.c 1.4

cvs2fossil does
create repository 'example' with user1?
then
first.c rev 1.1 1.2 1.3 1.4
and then
second.c rev 1.1 1.2 1.3 1.4

which test-? are used to accomplish this?

Rene
>
> 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 file to a different version but saving with a
>> different name?
>
> You can use the web interface to download any version of any file you
> want.  Your web browser will normally let you choose the name.
>
>  From the command-line, you can try using the "test-content-get"
> command:
>
>  fossil test-content-get SHA1-hash-of-file output-filename
>
>
>> ___
>> fossil-users mailing list
>> fossil-users@lists.fossil-scm.org
>> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
> D. Richard Hipp
> d...@hwaci.com
>
>
>
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
>


___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Some questions about fossil

[Daniel Clark]

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 / DVCS types.

(which would also have the nice side benefit of making
http://sscm.masukomi.org/ work)

-- 
Daniel JB Clark   | Sys Admin, Free Software Foundation
pobox.com/~dclark | http://www.fsf.org/about/staff#danny



signature.asc
Description: OpenPGP digital signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] cvs2fossil problems (Was: Re: Some questions about fossil)

[Andreas Kupries]

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 discussed in the list but is not corrected in the
>trunk

This looks to be a trivial change. Assuming that the syntax is similar. 
discussed on the list ... Ok, will dive into my mail archives to see if I can 
find this again ...

>b) If gpg signature is not defined for current user, it just fails,
> does not give opportunity to say that signature is not desired

What is the command line you invoked cvs2fossil with ?
In which phase of cvs2fossil does it fail ?
What is the error message ?

>c) If project is inside a subdirectory inside cvsroot, it fails
> when trying to create the repository file (can be fixed creating
>manually the directory)

When you say cvsroot, are you talking about the top directory of your test 
repository, or the administrative directory named 'CVSROOT' inside of it ?

What is the command line you invoked cvs2fossil with ?
In which phase of cvs2fossil does it fail ?
What is the error message you see ?


>d) Once the repository is created, it works well from the browser
> ui. Howerver, when doing a "fossil open ...", it fails and
>answers: "fossil: object [1503758b20] is not a check-in". And
> no file is created. What happens?

That seems to be the biggest problem, and seems to indicate that a bad 
repository was generated. I have not seen such a message before and do not know 
what it signifies. This one will require serious source diving in fossil itself 
to understand what it is complaining about before I can even try to understand 
what cvs2fossil is doing wrong.

> a) b) and c) should be easy to fix.

Tentatively agreed, and assuming I get more information about the problem, per 
my questions above.

Best might be to give me both the command line you use, and the CVS repository 
you are working with. I do not know however if the latter is something you can 
(are allowed to) hand out outside of your company or organization.

 > Point d) I have no idea what
> happens.

Me neither, at this point.

-- 
Sincerely,
 Andreas Kupries 
 Developer @
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Some questions about fossil

[Ramon Ribó]

  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
   trunk
   b) If gpg signature is not defined for current user, it just fails,
does not give opportunity to say that signature is not desired
   c) If project is inside a subdirectory inside cvsroot, it fails
when trying to create the repository file (can be fixed creating
   manually the directory)
   d) Once the repository is created, it works well from the browser
ui. Howerver, when doing a "fossil open ...", it fails and
   answers: "fossil: object [1503758b20] is not a check-in". And
no file is created. What happens?

a) b) and c) should be easy to fix. Point d) I have no idea what
happens.



2009/10/7 Andreas Kupries :
> 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 (the details are in another message).
>
> Is it possible to send me this message ? It seems that I missed it. As such I
> do not know (yet) what you are talking about.
>
>  > Might we
>> have some expectations that it will work in the future
>
> Not really possible to answer this with specificity without knowing what the
> actual problems are. Only in general, the easier to understand the problem and
> making a fix, the better the chances of me doing it.
>
> General side note: The cvs2svn application (written in python) is the 
> spiritual
> ancestor of cvs2fossil (*). As such it would be an interesting comparison to
> see if whatever CVS repository is giving you trouble with cvs2fossil is giving
> cvs2svn (similar) trouble as well.
>
> (*)     I used the general architectural concepts (phases and object classes),
>        and basic information they had unearthed about revision(number)s,
>        things to do, etc., while writing my stuff from scratch using a nicer
>        persistent data store (sqlite instead of their flat text files, pickled
>        python objects, and the like).
>
>
>  > or is it better
>> that we develop
>> our own solutions for converting from cvs to fossil?
>
> What about the third option ? I.e. editing cvs2fossil instead of developing
> from scratch ?
>
> --
> Sincerely,
>     Andreas Kupries 
>     Developer @    
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Import into issue tracker?

[Daniel Clark]

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 $100 towards this.

Another option are bidding sites like http://www.rentacoder.com - I'm
not sure what the intense knowledge of code vs. cheaper non-us cost of
living trade off is in this case; I can tell you that I know the best
practical guys and they do very good work.

Cheers and best of luck,
-- 
Daniel JB Clark   | Sys Admin, Free Software Foundation
pobox.com/~dclark | http://www.fsf.org/about/staff#danny



signature.asc
Description: OpenPGP digital signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Some questions about fossil

[Andreas Kupries]

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 (the details are in another message).

Is it possible to send me this message ? It seems that I missed it. As such I 
do not know (yet) what you are talking about.

 > Might we
> have some expectations that it will work in the future

Not really possible to answer this with specificity without knowing what the 
actual problems are. Only in general, the easier to understand the problem and 
making a fix, the better the chances of me doing it.

General side note: The cvs2svn application (written in python) is the spiritual 
ancestor of cvs2fossil (*). As such it would be an interesting comparison to 
see if whatever CVS repository is giving you trouble with cvs2fossil is giving 
cvs2svn (similar) trouble as well.

(*) I used the general architectural concepts (phases and object classes),
and basic information they had unearthed about revision(number)s,
things to do, etc., while writing my stuff from scratch using a nicer
persistent data store (sqlite instead of their flat text files, pickled
python objects, and the like).


 > or is it better
> that we develop
> our own solutions for converting from cvs to fossil?

What about the third option ? I.e. editing cvs2fossil instead of developing 
from scratch ?

-- 
Sincerely,
 Andreas Kupries 
 Developer @
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Some questions about fossil

[Ramon Ribó]

> 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 message). Might we
have some expectations that it will work in the future or is it better
that we develop
our own solutions for converting from cvs to fossil?
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Some questions about fossil

[Andreas Kupries]

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-override userid

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 ?

-- 
Sincerely,
 Andreas Kupries 
 Developer @
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Some questions about fossil

[D. Richard Hipp]

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 file to a different version but saving with a
> different name?

You can use the web interface to download any version of any file you  
want.  Your web browser will normally let you choose the name.

 From the command-line, you can try using the "test-content-get"  
command:

 fossil test-content-get SHA1-hash-of-file output-filename


> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

D. Richard Hipp
d...@hwaci.com



___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] Some questions about fossil

[Ramon Ribó]

   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-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] RamDebugger as fossil GUI

[Ramon Ribó]

> 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 RamDebugger download (changes are not still there) is here:

http://www.compassis.com/ramdebugger/Download

(some components from standard installation are not in fossil)
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] RamDebugger as fossil GUI

[D. Richard Hipp]

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



___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] RamDebugger as fossil GUI

[Ramon Ribó]

   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 so as it can be used as a fossil gui for
commit, add, update, tcl.

The repository is here (you can find the details of what is
RamDebugger in that place):

http://www.compassis.com:8079/c/ramdebugger

Some comments about issues found when implementing the fossil gui:

1- command gdiff does not work well. At the same time, it does not permit
to compare two ancient versions.

2- In order to implement a manual gdiff, the implemented way has been to
rename temporary the file, use "fossil revert", make the gdiff and rename
the file again. This is not nice as the modification of a user
file is inherently
dangerous. Shouldn't it be possible for "fossil revert" to specify
an alternate
name for the file to be checked out?

3- I understand the idea of commit a full change set, committing all
the modified
   files at the same time. And I like the idea. However, there are
situations where
   someone does not desire to include a modified file in the commit or wants to
   commit first some files and later other files. Shouldn't it be
possible to make
   a commit that includes only some of the modified files?


 I'll appreciate any comments about the fossil gui interface (of
course it is very
simple now).
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] gdiff - was: Some questions about fossil

[Benjohn Barnes]

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:
>
>fossil gdiff -r 55a6 tools/cvs2fossil/lib/c2f_fossil.tcl
>
> and gives the error:  fossil: no artifacts match the prefix "55a6"
> where 55a6 is copied from the web browser as the prefix of the sha1
> name identifying the version. What happens?

Hi Ramon,

I think this is the same problem I had with the OS X graphical diff.

The issue seemed to be that the graphical diff's launch binary would  
start the graphical diff application proper, and then exit, at which  
point fossil would delete them. The diff application proper would then  
finish launching and look for the files given to it by the launch  
application, only to find that they don't exist.

I found that if I left the graphical diff application running, it  
would have time to read the files given to it by the launch binary.  
Far from a perfect solution, but perhaps it'll get you by (if that is  
the problem at all).

Cheers,
Benjohn

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users