monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] net.venge.monotone: 384d89bf03cca6815b2df258000


From: code
Subject: [Monotone-commits-diffs] net.venge.monotone: 384d89bf03cca6815b2df2580001d67378e41d26
Date: Mon, 14 May 2012 02:25:30 +0200 (CEST)

revision:            384d89bf03cca6815b2df2580001d67378e41d26
date:                2012-05-13T13:25:14
author:              address@hidden
branch:              net.venge.monotone
changelog:
* src/cmd_conflicts.cc: better fix for issue 202

manifest:
format_version "1"

new_manifest [19729738a4a31e99edfea1cae8c757dc8f9886c5]

old_revision [638fcfaa13e634672cfca872b84448bb1d785ba2]

patch "src/cmd_conflicts.cc"
 from [4e9e8ec8d121a0cab4789071e9a208c9f1f3f05c]
   to [86bf4eb2e0608a8b9814cef8b416626b4aa0ca90]
============================================================
--- src/cmd_conflicts.cc	4e9e8ec8d121a0cab4789071e9a208c9f1f3f05c
+++ src/cmd_conflicts.cc	86bf4eb2e0608a8b9814cef8b416626b4aa0ca90
@@ -291,6 +291,8 @@ set_first_conflict(database & db,
                    args_vector const & args,
                    side_t side)
 {
+  E(args.size() > 0, origin::user, F("wrong number of arguments"));
+
   if (side != neither)
     {
       for (std::vector<duplicate_name_conflict>::iterator i = conflicts.result.duplicate_name_conflicts.begin();
@@ -480,7 +482,6 @@ CMD(resolve_first, "resolve_first", "", 
   database db(app);
   conflicts_t conflicts (db, app.opts.conflicts_file);
 
-  E(args.size() == 1, origin::user, F("wrong number of arguments"));
   set_first_conflict(db, app.lua, conflicts, args, neither);
 
   conflicts.write (db, app.lua, app.opts.conflicts_file);

reply via email to

[Prev in Thread] Current Thread [Next in Thread]