Please take our Survey
logo       

Choosing A Webhost:
A web hosting service is a type of Internet hosting service that allows individuals and organizations to provide their own website accessible via the World Wide Web. Web hosts are companies that provide space on a server they own for use by their clients as well as providing Internet connectivity, typically in a data center. Web hosts can also provide data center space and connectivity to the Internet for servers they do not own to be located in their data center, called colocation. more...

identical changes conflict: msg#00010

version-control.bitkeeper.user

Subject: identical changes conflict

As I described before, I test an SCM Carnival setup where several
distributed SCMs, such as tla, darcs, and bk, coexist in the same
directory. Update/commit/pull cycle involves calling each SCM's
corresponding command in sequence. Commit is not a problem, as
changes route into their respective SCMs' separate auxiliary
subdirectories. Pulls, however, do conflict -- the first SCM gets to
pull nicely, changing the sources themselves properly as well as its
own auxiliaries. The remaining SCMs, however, detect a conflict in
the modified sources -- since it turns out they don't check for the
case WHERE THE CHANGES ARE IDENTICAL. Probably it's not typical in
common non-automated use, but I wonder what's the reasoning there.

In case you don't follow all that mumbo-jumbo with multiple SCMs,
here's a simple, purely bk case. Create a local repo and mirror it
in a remote repo. Create a text file in one repo and sync it into
another. Now do this: add a line to the file in the local repo and
commit. Then go to the remote, ADD THE SAME LINE MANUALLY BEFORE
SYNCING, so that the files are now in fact identical in source but not
as recorded in the auxiliary bk directories. Now bk pull cannot do it
job, saying SCCS/s.file is edited.
If bk were to check that the result of aplying the patch to the last
commit would indeed yield the new local file identical to the one
present, perhaps it might see
there's no conflict and not bother with it? At least I'd love to see
an option to tell it that's the case, in the sense of
--auto-resolve-identical or
some such.

Cheers,
Alexy


<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

Recently Viewed:
version-control...    qnx.openqnx.dev...    redhat.rhn.user...    ietf.openpgp/20...    mail.mutt.user/...    web.microformat...    java.sync4j.use...    education.ezpro...    user-groups.blu...    solaris.manager...    org.fitug.debat...    technology.erps...    politics.activi...    linux.redhat.fe...    bug-tracking.ma...    xfce.user/2004-...    hams/2004-11/ms...    kde.users.pim/2...    culture.cooking...    freebsd.devel.x...    gnu.m4.adhoc/20...    ngpt.user/2002-...    apple.fink.deve...   
Home | advertise | OSDir is an inevitable website. super tiny logo

Free Magazines

Cisco News
Receive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business.
subscribe

Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field.
subscribe

The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business.
subscribe

Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company.
subscribe

Total Telecom Total Telecom is "The Economist of the communications industry".
subscribe

Navigation