sounds good, thanks for the tip :)
On Oct 25, 10:01 am, mdipierro wrote:
> This may be useful:
>
> http://www.ke-cai.net/2010/05/tracking-change-with-google-diff-matchhttp://neil.fraser.name/software/diff_match_patch/svn/trunk/demos/dem...
>
> look at the page source. It uses:
>
> http://neil
This may be useful:
http://www.ke-cai.net/2010/05/tracking-change-with-google-diff-match.html
http://neil.fraser.name/software/diff_match_patch/svn/trunk/demos/demo_diff.html
look at the page source. It uses:
http://neil.fraser.name/software/diff_match_patch/svn/trunk/javascript/diff_match_patch
I am flying to a conference so there is no hurry. Anything you can get
done within the next 8 days will be great.
On Oct 24, 11:15 pm, mart wrote:
> k, items 1 and 2 should be simple enough item 3, that is a
> different story, but ok, sure. I think merging outside of the
> mercurial context
k, items 1 and 2 should be simple enough item 3, that is a
different story, but ok, sure. I think merging outside of the
mercurial context is best though, then simply update the remote
repository with the merged file (and include good notes describing
both source files and capturing the diffs
I would be happier with much less...
1) a button in the /admin/mercurial/revision/ page that says [diff]
and provides a text output with a diff between the revision and the
current code
2) a few more fields in the /admin/mercurial/commit page that say
changelog: write something here
repository:
K, good stuff! I'll use what you and Boris came up with and integrate
to mine (will help speed things up) the other project :) and for the
other thing, great idea (i think). what do you mean by "web
repository"? do you mean reproduce from the code behind a live web2py
server instance? which would
Actually I just did this with some help from Boris from the mercurial
mailing list.
Now if you run web2py from source ad you have mercurial installed
(easy_install mercurial) you can use the web2py admin to:
- create a repository (this is done automatically and it also makes
a .hgignore)
- commit
Hi Massimo,
Ok, now I feel bad... I have not had the time to finish the
integration app I promised... Much is done, but not yet complete... I
still do intend on completing though... hopefully soon...
Until then, what is your intent here? are you looking to restore a
fileset (or entire tree) to
8 matches
Mail list logo
