Author: steveking
Date: Sun May 9 09:11:59 2010
New Revision: 942516
URL: http://svn.apache.org/viewvc?rev=942516view=rev
Log:
* STATUS: Vote for the r876032 group, for r898048 and the r935992 group.
Modified:
subversion/branches/1.6.x/STATUS
Modified: subversion/branches/1.6.x/STATUS
URL:
Author: dannas
Date: Sun May 9 19:35:28 2010
New Revision: 942591
URL: http://svn.apache.org/viewvc?rev=942591view=rev
Log:
First step of removing the usage of the entry field in svn_wc_status3_t
for detecting if a path is versioned. No semantic changes.
We still have a number of usages inside
Author: dannas
Date: Sun May 9 20:14:09 2010
New Revision: 942605
URL: http://svn.apache.org/viewvc?rev=942605view=rev
Log:
Replace some uses of entry-kind.
* subversion/libsvn_wc/status.c
(assemble_status.c): Use information fetched with
svn_wc__db_read_info() for detecting what kind a
Author: gstein
Date: Sun May 9 20:34:19 2010
New Revision: 942616
URL: http://svn.apache.org/viewvc?rev=942616view=rev
Log:
Remove some obsolete defines from wc.h.
* subversion/libsvn_wc/wc.h:
(SVN_WC__TMP_EXT, SVN_WC__ADM_KILLME, SVN_WC__KILL_ADM_ONLY): remove
(SVN_WC__ADM_LOCK,
Author: gstein
Date: Sun May 9 22:35:33 2010
New Revision: 942625
URL: http://svn.apache.org/viewvc?rev=942625view=rev
Log:
Allow NULL value for WORK_ITEM parameter of svn_wc__db_wq_add(). This
should simplify some callers.
* subversion/libsvn_wc/wc_db.c:
(svn_wc__db_wq_add): don't assert on
Author: gstein
Date: Sun May 9 22:40:49 2010
New Revision: 942626
URL: http://svn.apache.org/viewvc?rev=942626view=rev
Log:
Begin aggregating all work items into a single set, rather than performing
multiple db_wq_add calls.
* subversion/libsvn_wc/update_editor.c:
(merge_file): return a set
Author: gstein
Date: Sun May 9 23:10:05 2010
New Revision: 942628
URL: http://svn.apache.org/viewvc?rev=942628view=rev
Log:
Rename parameters on the svn_wc__loggy_* functions to note they must be
absolute paths. Assert this fact, and simplify loggy_path().
* subversion/libsvn_wc/log.h:
Author: gstein
Date: Sun May 9 23:41:01 2010
New Revision: 942631
URL: http://svn.apache.org/viewvc?rev=942631view=rev
Log:
Convert all the old loggy functions to build/return a work item rather
than directly install it into the queue. Adjust all callers to immediately
add the work item to the
Author: gstein
Date: Sun May 9 23:58:05 2010
New Revision: 942632
URL: http://svn.apache.org/viewvc?rev=942632view=rev
Log:
Add helper functions for paths that are persisted to disk. Saving an
abspath to disk prevents moving a working copy.
* subversion/libsvn_wc/wc_db.h:
*
Author: gstein
Date: Mon May 10 00:09:55 2010
New Revision: 942633
URL: http://svn.apache.org/viewvc?rev=942633view=rev
Log:
Return more work items from merge_file(), rather than performing a manual
queuing in the middle.
* subversion/libsvn_wc/update_editor.c:
(merge_file): stop calling
Author: gstein
Date: Mon May 10 00:59:32 2010
New Revision: 942637
URL: http://svn.apache.org/viewvc?rev=942637view=rev
Log:
Propagate work items out of svn_wc__internal_merge() rather than directly
queuing them. The two callers now queue the resulting work item(s).
* subversion/libsvn_wc/wc.h:
Author: gstein
Date: Mon May 10 02:09:01 2010
New Revision: 942643
URL: http://svn.apache.org/viewvc?rev=942643view=rev
Log:
Collect more work items into internal_merge's returned items.
* subversion/libsvn_wc/merge.c:
(eval_conflict_func_result, preserve_pre_merge_files,
Author: gstein
Date: Mon May 10 03:41:06 2010
New Revision: 942652
URL: http://svn.apache.org/viewvc?rev=942652view=rev
Log:
Simplify the code path for resolving text conflicts on a file when it is
restored.
* subversion/libsvn_wc/conflicts.h:
(svn_wc__resolve_text_conflict): new helper
Author: gstein
Date: Mon May 10 03:55:08 2010
New Revision: 942653
URL: http://svn.apache.org/viewvc?rev=942653view=rev
Log:
We can now skip some immediate queuing of work items, since we can order
them properly against the merge_file() work. We still need to handle the
ACTUAL props earlier than
14 matches
Mail list logo
